Hello All, This is fairly simple on both JTSDK WIn32 and Linux. If your not developing on Hamlib3, you could just delete the Hamlib3 Source Folders and rebuild with the scripts:
Delete the Hamlib3 Source Folders C:\JTSDK\src\hamlib3 ~/jtsdk/src/g4wjs-hamlib Update manually for JTSDK Win32 * Open JTSDK-MSYS * cd /c/JTSDK/src/hamlib3/src * Then follow Bills steps: git checkout integration git fetch git stash save git reset --hard origin/integration git stash pop Note: On my box, I had nothing to save / stash, spo Git gave me two messages stating as such. Update manually for JTSDK *Nix * Open Terminal * cd ~/jtsdk/src/g4wjs-hamlib * Then follow Bills steps: git checkout integration git fetch git stash save git reset --hard origin/integration git stash pop 73's Greg, KI7MT On 11/18/2015 07:01, Bill Somerville wrote: > Hi All, > > form some time the Hamlib rig control library that WSJT-X uses has been > sourced from my private fork of the official Hamlib library. This is > because we are using features and fixes that are ahead of the official > Hamlib releases. This is still the case but I have cleaned up my source > code branch. This was necessary because it has a very messy history > which caused problems. The cleanup involves a re-writing of the commit > history and this has consequences for any of you that have the Hamlib > code checked out from my fork. > > To resynchronize your checkout to the cleaned up branch you must execute > the following commands: > > cd <your-hamlib-checkout-directory> > git checkout integration > git fetch > git stash save > git reset --hard origin/integration > git stash pop > > This is a one off step and should not be added to any scripts for > building WSJT-X. > > If you use the JTSDK on Windows or Linux then I expect Greg will say > what you need to do, in the mean time you should be able to change > directory to the Hamlib checkout in the JTSDK working area and execute > the above commands. > > *Note:* If you do not take action then your WSJT-X builds will not be > tracking the correct Hamlib functionality. > > 73 > Bill > G4WJS. > > ------------------------------------------------------------------------------ > _______________________________________________ > wsjt-devel mailing list > wsjt-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/wsjt-devel > ------------------------------------------------------------------------------ _______________________________________________ wsjt-devel mailing list wsjt-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wsjt-devel
