From e59a7f09717406eef184279920c5b657008ac2e2 Mon Sep 17 00:00:00 2001
From: Michael Black W9MDB <mdblack98@yahoo.com>
Date: Thu, 18 Feb 2021 17:11:55 -0600
Subject: [PATCH] Update JTSDK build instructions

---
 scripts/README.build-JTSDK.txt | 75 ++++++++++++++++++----------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/scripts/README.build-JTSDK.txt b/scripts/README.build-JTSDK.txt
index b70dd9464..5cd9333d8 100644
--- a/scripts/README.build-JTSDK.txt
+++ b/scripts/README.build-JTSDK.txt
@@ -2,89 +2,94 @@
 JTSDK DLL Qt MinGW/MSYS2 Supplementary Notes
 ==============================================================
 
-This assumes you have an environment set up that conforms with 
-instructions in the WSJT-X Install notes that will build Hamlib 
+These instructions should work with JTSDk 3.2.0 Beta 3 and later.
 
-Before you start.... RTFM at <hamlib-base>/scripts/README.build-Windows-JTSDK.txt
+The JTSDK 3.2.0 Stream (and later) is available at 
+https://sourceforge.net/projects/hamlib-sdk/files/Windows/
+
+Future updates to the JTSDK may implement these steps into the
+MSYS2 "menu" command.
 
 
-1. Update Environ
-=================
+1. Update Environment
+=====================
 
-pacman -Syuu
+$ pacman -Syuu
 
 
 2. Deploy MinGW
 ===============
 
-Ensure that the ZIP, DOS2UNIX and GROFF packages are deployed 
-to and owrking in the MSYS2 Environment
+Ensure that the 'zip' , 'dos2unix' and 'groff' packages are deployed 
+to and working in the MSYS2 Environment
 
-pacman -S zip
-pacman -S dos2unix
-alias unix2dos='todos'
-pacman -S groff
+** Versions of JTSDK 3.2.0 Beta 4 and later will incorporate **
+** deployment of these tools into the Setup scripts. **
 
-The next step is possibly redudnant as it has been incorporated
-into build-w64-jtsdk.sh
+$ pacman -S zip
+$ pacman -S dos2unix
+$ pacman -S groff
 
-export PATH=$PATH:$GCCD_F:.
+** The next step may be redundant as it has been incorporated **
+** into build-w64-jtsdk.sh **
+
+$ export PATH=$PATH:$GCCD_F:.
 
 
 3. Create a dir $HOME/Builds
 ============================
 
-Open a MSYS2 Terminal fro a jtsdk64.ps1 environment 
+Open a MSYS2 Terminal from a jtsdk64.ps1 environment 
 
-In a JTSDK63 ENvironment type: 
+In a JTSDK PowerShell Environment launch MSYS2 with: 
 
 msys2
 
-In the msys2 enviro nment type:
+In the MSYS2 environment type:
 
-cd ~		<== ensure you at home
-mkdir builds
-cd builds
+$ cd ~		<== ensure you at home
+$ mkdir builds
+$ cd builds
 
 
 4. Locate and unzip LibUSB matching version deployed above into builds
 ======================================================================
 
-These steps in the original build-w64.sh script are redundant.
+** These steps in the original build-w64.sh script are redundant **
 
-You may skip this step.
+** You should familiarise yourself with these steps - but may skip this **
 
 JTSDK 3.2.0 (and later) points the environment to the libusb 
 deployment in X:\JTSDK64-Tools\tools\libusb through 
 environment variable $libusb_dir_f .
 
-If you need the source for LinUSB use steps similar to those
+If you need the source for LibUSB use steps similar to those
 below to obtain source:  
 
-wget https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-1.0.24/libusb-1.0.24.tar.bz2
-tar -xvf libusb-1.0.24.tar.bz2
+$ wget https://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-1.0.24/libusb-1.0.24.tar.bz2
+$ tar -xvf libusb-1.0.24.tar.bz2
 
 [ This creates a subdirectory libusb-1.0.24 ]
 
 
-5. Obtain latest Hamlib sourceforge
-===================================
+5. Obtain latest Hamlib Source from Github
+==========================================
 
-git clone git://git.code.sf.net/p/hamlib/code hamlib-4.2~git
+$ git clone https://github.com/Hamlib/Hamlib.git hamlib-4.2~git
 
 
 6. Start the Process Rolling
 ============================
 
-cd ./hamlib-4.2~git
-./bootstrap			       <== Not included in Nate's notes !
-./scripts/build-w64-jtsdk.sh hamlib-4.2~git
+$ cd ./hamlib-4.2~git
+$ ./bootstrap			       
+$ ./scripts/build-w64-jtsdk.sh hamlib-4.2~git
 
 
 7. Tadaa - Drumroll !
 =====================
 
-==> Package in ~/build/hamlib-4.2~git/hamlib-w64-4.2~git as hamlib-w64-4.2~git.zip
-==> Headers in ~/build/hamlib-4.2~git/hamlib-w64-4.2~git/include
-==> Library in ~/build/hamlib-4.2~git/hamlib-w64-4.2~git/lib/gcc as libhamlib.dll.a (rename to libhamlib.dll for application)
+==> Package ......... ~/build/hamlib-4.2~git/hamlib-w64-4.2~git ==> hamlib-w64-4.2~git.zip
+==> Headers ......... ~/build/hamlib-4.2~git/hamlib-w64-4.2~git/include
+==> Library &tools .. ~/build/hamlib-4.2~git/hamlib-w64-4.2~git/bin