[wsjt-devel] WSJT-X-1.4.0-rc1 ?
Hi all, Does anyone have last-minute must do commits for the WSJT-X code? Are we converging toward tagging revision 4363 as release candidate 1 for version 1.4.0 ? -- Joe, K1JT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
On 25/09/2014 15:13, Joe Taylor wrote: Hi all, Hi Joe, Does anyone have last-minute must do commits for the WSJT-X code? Are we converging toward tagging revision 4363 as release candidate 1 for version 1.4.0 ? I am still working through the consequences of adding in the local user guide. There are implications for the platforms other than Windows. There will be at least one more commit for Linux packaging and one for Mac also I expect. -- Joe, K1JT 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
On 25/09/2014 15:39, Joe Taylor wrote: Hi Joe, RR Bill, thanks for the update. OK, I think I'm done. The Linux package building is still short of making compliant packages but at least some sort of package (DEB and RPM) can be generated which will at least install and run from in system directories (/usr) without breaking anything AFAIK. Nobody ever came up with better icons and graphics for the installers. I must re-iterate that the ones in place were only meant as placeholders and I make no claims to be a competent graphic artist. If anyone is thinking of making better images I can supply the basic format, colour depth, alpha channel requirements and, size parameters for each of the several icons and images required by the build system for the various platforms. -- Joe 73 Bill G4WJS. On 9/25/2014 10:18 AM, Bill Somerville wrote: On 25/09/2014 15:13, Joe Taylor wrote: Hi all, Hi Joe, Does anyone have last-minute must do commits for the WSJT-X code? Are we converging toward tagging revision 4363 as release candidate 1 for version 1.4.0 ? I am still working through the consequences of adding in the local user guide. There are implications for the platforms other than Windows. There will be at least one more commit for Linux packaging and one for Mac also I expect. -- Joe, K1JT 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
On 25/09/2014 17:50, KI7MT wrote: Hi Bill, Hi Greg, On 9/25/2014 16:28, Bill Somerville wrote: On 25/09/2014 15:39, Joe Taylor wrote: Hi Joe, RR Bill, thanks for the update. OK, I think I'm done. The Linux package building is still short of making compliant packages but at least some sort of package (DEB and RPM) can be generated which will at least install and run from in system directories (/usr) without breaking anything AFAIK. The biggest thing I saw was the rigctld situation, which seems resolved now, at least for rc1 anyway. Unless someone has an issue with it, I think shipping a hamlib 3 rigctld called rigctld-wsjtx is just fine until the hamlib team get their v3 release through all the hoops; given that AFAIK they haven't even started that process yet, that will be quite some time into the future. The need for rigctld-wsjtx is only for a very limited number of specialized users and will not concern most WSJT-X users. The rest of the Debian folder / packaging will need to be done manually anyway. Why? Nobody ever came up with better icons and graphics for the installers. I must re-iterate that the ones in place were only meant as placeholders and I make no claims to be a competent graphic artist. If anyone is thinking of making better images I can supply the basic format, colour depth, alpha channel requirements and, size parameters for each of the several icons and images required by the build system for the various platforms. -- Joe 73 Bill G4WJS. On 9/25/2014 10:18 AM, Bill Somerville wrote: On 25/09/2014 15:13, Joe Taylor wrote: Hi all, Hi Joe, Does anyone have last-minute must do commits for the WSJT-X code? Are we converging toward tagging revision 4363 as release candidate 1 for version 1.4.0 ? I am still working through the consequences of adding in the local user guide. There are implications for the platforms other than Windows. There will be at least one more commit for Linux packaging and one for Mac also I expect. -- Joe, K1JT 73 Bill G4WJS. 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
Hi all, OK, I think I'm done. Full marks, indeed -- to all who have contributed so much! Bill, would you like to create a tag of .../branches/wsjtx at r4370? Packages for WSJT-X-1.4.0-rc1 would then be built from that revision, for all supported platforms. -- Joe -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
On 25/09/2014 18:14, KI7MT wrote: HI Bill, Hi Greg, On 9/25/2014 17:07, Bill Somerville wrote: On 25/09/2014 17:50, KI7MT wrote: Hi Bill, Hi Greg, On 9/25/2014 16:28, Bill Somerville wrote: On 25/09/2014 15:39, Joe Taylor wrote: Hi Joe, RR Bill, thanks for the update. OK, I think I'm done. The Linux package building is still short of making compliant packages but at least some sort of package (DEB and RPM) can be generated which will at least install and run from in system directories (/usr) without breaking anything AFAIK. The biggest thing I saw was the rigctld situation, which seems resolved now, at least for rc1 anyway. Unless someone has an issue with it, I think shipping a hamlib 3 rigctld called rigctld-wsjtx is just fine until the hamlib team get their v3 release through all the hoops; given that AFAIK they haven't even started that process yet, that will be quite some time into the future. The need for rigctld-wsjtx is only for a very limited number of specialized users and will not concern most WSJT-X users. I forgot to ask, is the Build External function working now or are you taking about shipping a pre-built bianry rigctld-wsjtx ? I been messing around on Windows and havn't built on Linux in a few days. The super build project is not ready for use yet and will probably take a while to get sorted out. The WSJT-X build process is basically the same on all platforms, hamlib has to be built separately. Once that is done the WSJT-X CMake build drags in the hamlib static archive library for linking into the wsjtx executable and the rigctld built by the hamlib build. As part of the install phase the rigctld executable is renamed to rigctld-wsjtx. Just running the normal install or package targets on every platform does all that is required. snip 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X-1.4.0-rc1 ?
Hi Bill, On 9/25/2014 17:20, Bill Somerville wrote: On 25/09/2014 18:14, KI7MT wrote: HI Bill, Hi Greg, On 9/25/2014 17:07, Bill Somerville wrote: On 25/09/2014 17:50, KI7MT wrote: Hi Bill, Hi Greg, On 9/25/2014 16:28, Bill Somerville wrote: On 25/09/2014 15:39, Joe Taylor wrote: Hi Joe, RR Bill, thanks for the update. OK, I think I'm done. The Linux package building is still short of making compliant packages but at least some sort of package (DEB and RPM) can be generated which will at least install and run from in system directories (/usr) without breaking anything AFAIK. The biggest thing I saw was the rigctld situation, which seems resolved now, at least for rc1 anyway. Unless someone has an issue with it, I think shipping a hamlib 3 rigctld called rigctld-wsjtx is just fine until the hamlib team get their v3 release through all the hoops; given that AFAIK they haven't even started that process yet, that will be quite some time into the future. The need for rigctld-wsjtx is only for a very limited number of specialized users and will not concern most WSJT-X users. I forgot to ask, is the Build External function working now or are you taking about shipping a pre-built bianry rigctld-wsjtx ? I been messing around on Windows and havn't built on Linux in a few days. The super build project is not ready for use yet and will probably take a while to get sorted out. The WSJT-X build process is basically the same on all platforms, hamlib has to be built separately. Once that is done the WSJT-X CMake build drags in the hamlib static archive library for linking into the wsjtx executable and the rigctld built by the hamlib build. As part of the install phase the rigctld executable is renamed to rigctld-wsjtx. Just running the normal install or package targets on every platform does all that is required. Ok, I may have to write up a simple Makefile to first build hamlib, then WSJT-X to simplify the debian/rules file (the build script). This weekend is CQ WW RTTY Contest, but I'll try to get this done and working by Monday of next week. I think everything is ok on Windows now. Looks like Joe can build Hamlib3 and I have it working as well, so that can be updated for the -rc1 release if need be. Looks like John has things sorted out for Mac also. snip 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- 73's Greg, KI7MT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
[wsjt-devel] WSJT-X v1.4 branched from trunk.
Hi All, the first cut of v1.4.0 has been made. The tag tags/wsjtx-1.4.0-rc1 has been recorded. Anyone making a distribution kit for the upcoming Beta release of v1.4.0 must checkout this tag and ensure you have a clean source tree before building it. Do not commit any changes to the tag as it is now set in stone. Bugfixes will go into wsjtx-1.4.0-rc2 via the wsjtx-1.4 branch even if rc1 is unusable. I have created a new branch branches/wsjtx-1.4 from the tags/wsjtx-1.4.0-rc1 label and this branch is where any bugfixes moving towards wsjtx-1.4.0-rc2 must be committed. Also you will need to merge any bugfix changes to the wsjtx-1.4 branch into the trunk which is branches/wsjtx (one day we really need to move this to trunk). Please use the 'svn merge' command to do any merge commits to the main line so that a proper branch history is maintained. I have updated the trunk (branches/wsjtx) to v1.5.0 and it is fine to commit new features and bugfixes not deemed to be serious enough to change v1.4 to this. As far as the main line is concerned, v1.4 is history. 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] Credits mismatch
Mike -- Credits mismatch between About window and the manual Thanks for catching this discrepancy. The online manual has been fixed; we'll need to correct the list in About in rc2. -- Joe, K1JT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] Credits mismatch
Hi Joe and all.i have just done an update of WSJT-X using a script i put together from the origional lines for cmake sent out by Bill im now showing WSJT-X v1.5.0-c1 r4375 looks goodwill check it all out and report any problems Bill...im still using your origonal hamlib 3 files you sent out...do i have to upgradethe instructions you sent out for the upgrade look a bit daunting 73 David VK4BDJ On 26/09/14 05:50, Joe Taylor wrote: Mike -- Credits mismatch between About window and the manual Thanks for catching this discrepancy. The online manual has been fixed; we'll need to correct the list in About in rc2. -- Joe, K1JT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- 73 David VK4BDJ -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] Hamlib update - was: Credits mismatch
Hi Billyep im on Linux...ok will try and follow your instructions for the update of Hamlib3 Just worked Pierre F5LMI with about 30 watts so the new update of WSJT-X is working well 73 David VK4BDJ On 26/09/14 06:25, Bill Somerville wrote: On 25/09/2014 21:02, David wrote: Hi David, Hi Joe and all.i have just done an update of WSJT-X using a script i put together from the origional lines for cmake sent out by Bill im now showing WSJT-X v1.5.0-c1 r4375 looks goodwill check it all out and report any problems Bill...im still using your origonal hamlib 3 files you sent out...do i have to upgradethe instructions you sent out for the upgrade look a bit daunting I think you are on Linux, the hamlib build should be easy for you, just follow the steps I sent out in message https://sourceforge.net/p/wsjt/mailman/message/32860232/ you should be able to cut and paste the recipe for the first part, then change the definition of CMAKE_PREFIX_PATH in your WSJT-X build tree and you are good to go. Any questions willing answered. 73 David VK4BDJ 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- 73 David VK4BDJ -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
On 25/09/2014 21:57, Joe Taylor wrote:
Hi Bill,
Hi Joe,
Thanks for posting a clear statement of correct repository procedures
going forward.
All seems OK to me, except possibly for your parenthetical statement
one day we really need to move this to trunk.
We can't do this unless we give up the notion that WSJT, MAP65, WSPR,
WSPR-X, and WSJT-X are all part of the same project. Historically,
the trunk: of the project is WSJT.
Not a problem. Multi project repos usually have
project1/{trunk,branches,tags} project2/{trunk,branches,tags} etc..
The reason it is important is that most other source control systems
have much stronger concepts for branches and tags and moving to them
while maintaining all history is normally supported with tools if you
have a conventional repo layout.
It's not critical or urgent but an example use case is my situation. I
use git-svn because it gives me lots of excellent git features while
working with svn but because of our repo layout I can't easily have two
projects checked out at once because it expects everything to reside in
the trunk with only branches and tags in their respective locations. For
example if I want to build the docs I have to switch my working tree to
docs, another branch, which hides the branch I was on 'wsjtx' while I'm
there. This is the main reason that I don't edit the docs or contribute
to other JT projects as it is so painful to coerce git-svn to bend the
standard layout rules.
-- Joe, K1JT
73
Bill
G4WJS.
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
Hi Joe, Bill,
I just want to make sure I understand all this now. If we use the
standard branch head for WSJTX, that is now being called wsjtx v1.5?
And to pull WSJTX-1.4.0-RC1, we use:
svn co https://svn.code.sf.net/p/wsjt/wsjt/tags/wsjtx-1.4.0-rc1
or
svn co https://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.4
?
73's
Greg, KI7MT
On 9/25/2014 21:11, Bill Somerville wrote:
On 25/09/2014 21:57, Joe Taylor wrote:
Hi Bill,
Hi Joe,
Thanks for posting a clear statement of correct repository procedures
going forward.
All seems OK to me, except possibly for your parenthetical statement
one day we really need to move this to trunk.
We can't do this unless we give up the notion that WSJT, MAP65, WSPR,
WSPR-X, and WSJT-X are all part of the same project. Historically,
the trunk: of the project is WSJT.
Not a problem. Multi project repos usually have
project1/{trunk,branches,tags} project2/{trunk,branches,tags} etc..
The reason it is important is that most other source control systems
have much stronger concepts for branches and tags and moving to them
while maintaining all history is normally supported with tools if you
have a conventional repo layout.
It's not critical or urgent but an example use case is my situation. I
use git-svn because it gives me lots of excellent git features while
working with svn but because of our repo layout I can't easily have two
projects checked out at once because it expects everything to reside in
the trunk with only branches and tags in their respective locations. For
example if I want to build the docs I have to switch my working tree to
docs, another branch, which hides the branch I was on 'wsjtx' while I'm
there. This is the main reason that I don't edit the docs or contribute
to other JT projects as it is so painful to coerce git-svn to bend the
standard layout rules.
-- Joe, K1JT
73
Bill
G4WJS.
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
--
73's
Greg, KI7MT
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
On 26/09/2014 00:03, KI7MT wrote:
Hi Joe, Bill,
Hi Greg,
I just want to make sure I understand all this now. If we use the
standard branch head for WSJTX, that is now being called wsjtx v1.5?
Yes, actually wsjtx-1.5.0-rc1.
And to pull WSJTX-1.4.0-RC1, we use:
svn co https://svn.code.sf.net/p/wsjt/wsjt/tags/wsjtx-1.4.0-rc1
Yes, this is the set in stone never to change record of what made RC1.
Probably the only people who would check this out are those who want to
build RC1 kits. It also serves as a label for diffs if you wanted to see
what has changed since RC1.
or
svn co https://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx-1.4
?
This is where you would check in bug fixes for RC1 i.e. steps toward
RC2, RC3, ... and the actual release of v1.4.0.
Any bug fixes put here would normally (probably always) be merged into
branches/wsjtx so that they get into v1.5 and later as well.
If there is an RC2 etc. this branch is what will get tagged to record
them as well.
If we decide to release v1.4.0 and then find we need to make a new
release before v1.5 is ready then we might branch again from the v1.4 as
v1.4.1, but as we don't promise any support for old versions we would
probably simply tag the v1.4 branch as v1.4.1-rc1 and keep the history
of v1.4.x linear.
A developer who is expecting to provide bugfixes for v1.4 as well as
work on v1.5 would normally have two r/w svn source trees, one in the
main line and one in the branch v1.4. You can do clever tricks with 'svn
switch' and a single source tree but it's a bit complicated and IMHO two
trees is easiest for a small project like WSJT-X.
If you don't intend to contribute to v1.4 then just carrying on with the
branches/wsjtx (the main line) is fine - i.e. do nothing differently
from before the branch existed.
I hope that helps, it gets very complicated quickly with branching so
less is more generally. The big pay off is that v1.5 new features can
progress without impacting the v1.4.0 release which may take a few
week/months to hit stability.
As for the docs, they are not within the scope of the branch or v1.4.0
tags so they continue on a linear history. I guess we will tag them too
at the point of the last v1.4.0 build so we know what we made the
release with FWIW.
73's
Greg, KI7MT
73
Bill
G4WJS.
On 9/25/2014 21:11, Bill Somerville wrote:
On 25/09/2014 21:57, Joe Taylor wrote:
Hi Bill,
Hi Joe,
Thanks for posting a clear statement of correct repository procedures
going forward.
All seems OK to me, except possibly for your parenthetical statement
one day we really need to move this to trunk.
We can't do this unless we give up the notion that WSJT, MAP65, WSPR,
WSPR-X, and WSJT-X are all part of the same project. Historically,
the trunk: of the project is WSJT.
Not a problem. Multi project repos usually have
project1/{trunk,branches,tags} project2/{trunk,branches,tags} etc..
The reason it is important is that most other source control systems
have much stronger concepts for branches and tags and moving to them
while maintaining all history is normally supported with tools if you
have a conventional repo layout.
It's not critical or urgent but an example use case is my situation. I
use git-svn because it gives me lots of excellent git features while
working with svn but because of our repo layout I can't easily have two
projects checked out at once because it expects everything to reside in
the trunk with only branches and tags in their respective locations. For
example if I want to build the docs I have to switch my working tree to
docs, another branch, which hides the branch I was on 'wsjtx' while I'm
there. This is the main reason that I don't edit the docs or contribute
to other JT projects as it is so painful to coerce git-svn to bend the
standard layout rules.
-- Joe, K1JT
73
Bill
G4WJS.
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
Hi Bill,
Joe:
All seems OK to me, except possibly for your parenthetical statement
one day we really need to move this to trunk.
We can't do this unless we give up the notion that WSJT, MAP65, WSPR,
WSPR-X, and WSJT-X are all part of the same project. Historically,
the trunk: of the project is WSJT.
Bill:
Not a problem. Multi project repos usually have
project1/{trunk,branches,tags} project2/{trunk,branches,tags} etc..
The reason it is important is that most other source control systems
have much stronger concepts for branches and tags and moving to them
while maintaining all history is normally supported with tools if you
have a conventional repo layout.
It's not critical or urgent but an example use case is my situation. I
use git-svn because it gives me lots of excellent git features while
working with svn but because of our repo layout I can't easily have two
projects checked out at once ...
I'm sure you have far more experience with such things than I do. Maybe
it's not just what you want, but I nearly always have the main branch
all of our programs -- WSJT, MAP65, WSPR, WSPR-X, and WSJT-X -- checked
out at once, and the SVN-versioned documentation for them as well.
Switching between them is no problem at all, I just open a new
command-line terminal and cd to the right place.
Quite possibly, I'm missing something here -- or don't know about some
important feature(s) that you want.
For the record, I have no reason not to like a layout such as
project1/{trunk,branches,tags} project2/{trunk,branches,tags} etc.,
except that it's not what we have now -- and as yet I don't appreciate
why it might be better.
Bill:
because it expects everything to reside in
the trunk with only branches and tags in their respective locations. For
example if I want to build the docs I have to switch my working tree to
docs, another branch, which hides the branch I was on 'wsjtx' while I'm
there. This is the main reason that I don't edit the docs or contribute
to other JT projects as it is so painful to coerce git-svn to bend the
standard layout rules.
If there's a significant reason why it's inconvenient for you to edit
the docs or contribute to the other JT programs, we should certainly
address it. But since I don't find such multi-tasking inconvenient at
all, I need to better understand the problem.
-- 73, Joe, K1JT
--
Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk
___
wsjt-devel mailing list
wsjt-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
Hi All, branching and merging in source control is often a source of confusion and seems daunting at first so here is an example that covers the Release branch situation we are currently in. Greg (KI7MT) has checked out the WSJT-X v1.4 branch branches/wsjtx-1.4 and made a change that needs to go into the next release candidate wsjtx-1.4.0-rc2. At the time of writing he has committed the change to the branch but not yet merged it into the main line (branches/wsjtx). The change he committed was changeset 4376 so lets have a look at it by running 'svn diff' on the branch. Note that this command is being run from an up to date main line checkout (branches/wsjtx): $ svn diff -c 4376 ^/branches/wsjtx-1.4 Index: about.cpp === --- about.cpp (revision 4375) +++ about.cpp (revision 4376) @@ -16,7 +16,7 @@ copy; 2001-2014 by Joe Taylor, K1JT, with grateful br acknowledgment for contributions from AC6SL, AE4JY, br DJ0OT, G4KLA, G4WJS, K3WYC, KA6MAL, KA9Q, KB1ZMX, br - KK1D, PY2SDR, VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.br); + KI7MT, KK1D, PY2SDR, VK3ACF, VK4BDJ, W4TI, W4TV, and W9MDB.br); } CAboutDlg::~CAboutDlg() So now to complete the change he needs to merge into the main line. Again from a checkout of the main line which should be up to date: $ svn merge -c 4376 ^/branches/wsjtx-1.4 --- Merging r4376 into '.': Uabout.cpp Note that this has updated the relevant files in the working directory, no changes have been committed to the repository at this stage. This type of merge is called a Cherrypicking merge where we have selected only the changes in one specific changeset to merge. This is exactly what we want in the Release branch scenario. Now as time goes on and the main line diverges from the branch due to new features getting committed, there is a chance that a merge will cause a conflict and you will have to edit the merged files to resolve the conflicts manually. This normally happens when the same line of a file has changed in both branch and main line since the branch was created. When there is a conflict svn merge writes some extra files to your workspace that can be used by a three way merge editor to make the conflict resolution easy to visualize and resolve. Merge conflict resolution is exactly the same process as dealing with conflicts after an update when someone else has committed a change while you were working on the same file in your workspace. Once you have resolved any conflicts just commit your changes as normal and you are done. Now you might say Why bother with all this merging, why can't I just make the changes again in the main line?. The answer is that svn keeps a record of merges made and will not allow them to be duplicated. Why is that important, well often some merges don't get made, unintentionally, so having svn be able to report what has been merged and what hasn't is a real bonus later on when you need to find out what has gone wrong when bugfixes made in the branch haven't turned up in the main line. Also it is easier to use the svn merge command than doing the changes over again. 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
On 26/09/2014 01:57, Joe Taylor wrote: Hi Bill, Hi Joe, Greg (KI7MT) has checked out the WSJT-X v1.4 branch branches/wsjtx-1.4 and made a change that needs to go into the next release candidate wsjtx-1.4.0-rc2. At the time of writing he has committed the change to the branch but not yet merged it into the main line (branches/wsjtx). Actually that was me, not Greg. And I thought I had done the desired merge -- but I recognized, after the fact, that I had not done it correctly. :-( Oops, sorry for the incorrect attribution, I blame the hour over here. Either way it seemed a good example to introduce the concept and execution to those who may be less familiar with svn. I decided to put a corrected merge off until tomorrow... (am not on the same computer, now). -- Joe 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
:-) I glad that's sorted out, as I don't think I've ever made any commits to WSJT-X branches .. If I did, it was minor, and a long time ago. You had me thinking something was seriously amiss :-) 73's Greg, KI7MT On 9/26/2014 01:00, Bill Somerville wrote: On 26/09/2014 01:57, Joe Taylor wrote: Hi Bill, Hi Joe, Greg (KI7MT) has checked out the WSJT-X v1.4 branch branches/wsjtx-1.4 and made a change that needs to go into the next release candidate wsjtx-1.4.0-rc2. At the time of writing he has committed the change to the branch but not yet merged it into the main line (branches/wsjtx). Actually that was me, not Greg. And I thought I had done the desired merge -- but I recognized, after the fact, that I had not done it correctly. :-( Oops, sorry for the incorrect attribution, I blame the hour over here. Either way it seemed a good example to introduce the concept and execution to those who may be less familiar with svn. I decided to put a corrected merge off until tomorrow... (am not on the same computer, now). -- Joe 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- 73's Greg, KI7MT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
Re: [wsjt-devel] WSJT-X v1.4 branched from trunk.
:-) I glad that's sorted out, as I don't think I've ever made any commits to WSJT-X branches .. If I did, it was minor, and a long time ago. You had me thinking something was seriously amiss :-) 73's Greg, KI7MT On 9/26/2014 01:00, Bill Somerville wrote: On 26/09/2014 01:57, Joe Taylor wrote: Hi Bill, Hi Joe, Greg (KI7MT) has checked out the WSJT-X v1.4 branch branches/wsjtx-1.4 and made a change that needs to go into the next release candidate wsjtx-1.4.0-rc2. At the time of writing he has committed the change to the branch but not yet merged it into the main line (branches/wsjtx). Actually that was me, not Greg. And I thought I had done the desired merge -- but I recognized, after the fact, that I had not done it correctly. :-( Oops, sorry for the incorrect attribution, I blame the hour over here. Either way it seemed a good example to introduce the concept and execution to those who may be less familiar with svn. I decided to put a corrected merge off until tomorrow... (am not on the same computer, now). -- Joe 73 Bill G4WJS. -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel -- 73's Greg, KI7MT -- Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer http://pubads.g.doubleclick.net/gampad/clk?id=154622311iu=/4140/ostg.clktrk ___ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
