Skip to content

Commit fe0a75d

Browse files
committed
To 4.1.0 - Final Docs and .md Update??
1 parent c5a888b commit fe0a75d

File tree

7 files changed

+63
-385
lines changed

7 files changed

+63
-385
lines changed

README.md

Lines changed: 23 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# JTSDK64 Applications and Tools: Beta Release 1
1+
# JTSDK64 Applications and Tools: Pre-Release (Development)
22

33
************************************************************************************
44
## JTSDK Version 4.1 Stream
@@ -542,7 +542,7 @@ Once complete you can exit the **JTSDK64-Setup** environment (i.e. close the **J
542542
- Launch the **JTSDK64-Tools** environment from the icon on your desktop.
543543

544544
```
545-
JTSDK x64 Tools v4.1.0a
545+
JTSDK x64 Tools v4.1.0
546546
--------------------------------------------------
547547
Package Version/Status
548548
--------------------------------------------------
@@ -551,12 +551,12 @@ Source .....: wsjtx
551551
Qt .........: 5.15.2/mingw81_64, Tools/mingw810_64
552552
Hamlib .....: Missing [Git: MASTER]
553553
FFTW .......: 3.3.10
554-
LibUSB .....: 1.0.28
554+
LibUSB .....: 1.0.29
555555
NSIS .......: 3.11
556556
PkgConfig ..: 2.1.0
557-
Ruby .......: 3.4.2-1
557+
Ruby .......: 3.4.5-1
558558
Subversion .: 1.14.2b
559-
CMake ......: 4.0.2
559+
CMake ......: 4.1.1
560560
Boost ......: Missing
561561
--------------------------------------------------
562562
@@ -573,7 +573,7 @@ You need to build these two (rather complex) library sources from source code.
573573
**Step 3a: Upgrade your Qt Deployment**
574574

575575
A Minimum Qt installation pegs at [Qt][] at version 5.15.2. If you did not use the "F" Full option for [Qt][] deployment or you
576-
want to add additional Qt versions - i.e. test Qt 6.8.1 - you should do so now.
576+
want to add additional Qt versions - i.e. test Qt 6.8.3 - you should do so now.
577577

578578
**Qt 5.15.2 is the Qt Development and Deployment environment for JT-ware. Qt6 streams are experimental and not supported for mainstream JT-ware compiles.**
579579

@@ -590,19 +590,19 @@ To add an additional version of Qt to the default Qt 5.15.2 version:
590590
- Navigate to the Qt Deployment directory
591591
- Run the Qt Maintenance Tool from your Qt deployment directory (i.e. **C:\JTASK64-Tools\tools\Qt**)
592592

593-
To add Qt 6.8.1 manually:
593+
To add Qt 6.8.3 manually:
594594

595-
- Add Qt 6.8.1 MinGW
596-
- Ensure that components Qt 6.8.1/MinGW 13.1.0 64 bit and Qt 6.8.1/Qt5 Compatability Module are added.
597-
- Select Qt 6.8.1/All Additional Libraries .
595+
- Add Qt 6.8.3 MinGW
596+
- Ensure that components Qt 6.8.3/MinGW 13.1.0 64 bit and Qt 6.8.3/Qt5 Compatability Module are added.
597+
- Select Qt 6.8.3/All Additional Libraries .
598598
- Add Developer and Designer Tools / MinGW 13.1.0 64-bit
599599
- (Recommended) Add the OpenSSL 1.1.1x toolkit (it helps with a WSJTX download - if it is still available).
600600
- (Recommended) Add the OpenSSL 3.x.1x toolkit (Future Enhancement).
601601

602602
On Completion:
603603

604604
- Adjust the maker file in **x:\JTSDK64-Tools\config** marker file to match the Qt version that you want to use
605-
- i.e. rename **qt5.15.2** to **qt6.8.1**
605+
- i.e. rename **qt5.15.2** to **qt6.8.3**
606606

607607
************************************************************************************
608608
There must only be ONE marker file for Qt in **x:\JTSDK64-Tools\config**
@@ -637,7 +637,18 @@ In **JTSDK64-Tools**:
637637

638638
**Step 3c: Deploy Boost for our selected Qt/MinGW Version.**
639639

640-
***THIS IS SLOW***. Source "dropins" of pre-built Boost Libraries are no longer maintained.
640+
**THIS IS SLOW**. Source "dropins" of pre-built Boost Libraries are no longer maintained.
641+
642+
The version of Boost to be deployed is set in **Versions.ini** .
643+
644+
**File:** Versions.ini
645+
```
646+
...
647+
boostv=1.88.0
648+
```
649+
**Note:** At the time of writing, **Versions of Boost > 1.88.0 will not build [WSJT-X 2.7.0][] properly**.
650+
651+
It is anticipated that this may be rectified soon. Please check the [JTSDK Forum][] for the latest updates.
641652

642653
************************************************************************************
643654
**Note:** Using PowerShell 7 instead of the default PowerShell Windows 5.1 can speed up the download and decompress stages considerably.

config/Versions.ini

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Set versions of packages that jtsdk64.ps1 will use
33
# This data is no longer set in jtsdk64.ps1 directly
44
fftwv=3.3.10
5-
libusbv=1.0.28
5+
libusbv=1.0.29
66
# Next can also be /MinGW64/dll or /VS2019/MS64/dll
77
libusbdll=/bin
88
# Next specifies path of VC runtimes
@@ -15,15 +15,14 @@ qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_re
1515
#q**tsource=https://download.qt.io/official_releases/online_installers
1616
nsisv=3.11
1717
pkgconfigv=2.1.0
18-
rubyv=3.4.4-2
18+
rubyv=3.4.5-1
1919
svnv=1.14.5
2020
#cmakev can be qtcmake for Qt deployed cmake - qtcmake - or set version number if deployed standalone i.e. 3.19.3
21-
cmakev=4.0.2
22-
sqlitev=3.50.1
21+
cmakev=4.1.1
22+
sqlitev=3.50.4
2323
# Next specifies the Boost download mirror to use. Mandatory.
2424
#b##stsource=https://boostorg.jfrog.io/artifactory/main/
2525
boostsource=https://archives.boost.io/
26-
# Note Version set to 1.85.0 for Qt 5.15.2 compatibility
2726
boostv=1.88.0
2827
# Move the directory marker for Hamlib Source into here... can be MASTER or NONE
2928
hlrepo=MASTER

docs/ver4/AN4.html

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
<table width="*" border="0">
1717
<tr>
1818
<td>
19-
<img src="../favicon.ico" alt=""/>
20-
</td>
19+
<img src="../favicon.ico" alt=""/>
20+
</td>
2121
<td>
22-
<h1>HAMLIB SDK Version 4 </h1>
23-
<h2>Evolving the JT-ware Software Developer's Kit (JTSDK)</h2>
24-
</td>
22+
<h1>HAMLIB SDK Version 4 </h1>
23+
<h2>Evolving the JT-ware Software Developer's Kit (JTSDK)</h2>
24+
</td>
2525
</tr>
2626
</table>
2727
</td>
@@ -72,12 +72,14 @@ <h3>Version 4.1.0</h3>
7272
<p>In addition the &quot;mirroring&quot; of <strong>build-hamlib.sh</strong> and <strong>build-hamlib.sh-static</strong> has been
7373
broken - with <strong>build-hamlib.sh</strong> offering a number of additional command-line switches to
7474
aid developers.</p>
75-
<p>The <strong>JTSDK 4.1.0</strong> provides a version of <a href="https://libusb.info/">LibUSB 1.0.27</a> that we have supplied. Update packages may suuply later versions.</p>
75+
<p>The <strong>JTSDK 4.1.0</strong> provides a version of <a href="https://libusb.info/">LibUSB 1.0.29</a> that we have supplied. Update packages may suuply later versions.</p>
7676
</ul>
7777

7878
<table width="*" align="center" border="1">
7979
<tr>
80-
<td class="custd"><p><strong>The project needs contributors - especially with better colour tastes - to write better documentation than what can be found here !!!</strong></p></td>
80+
<td class="custd">
81+
<p><strong>The project needs contributors - especially with better colour tastes - to write better documentation than what can be found here !!!</strong></p>
82+
</td>
8183
</tr>
8284
</table>
8385

@@ -94,7 +96,7 @@ <h3>Project Status</h3>
9496

9597
<table width="*" align="center" border="1">
9698
<tr>
97-
<td class="custd"><p>The recommended mainstream development environments are <a href="https://www.qt.io/download-open-source">Qt</a> <strong>5.15.2</strong> and <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/Boost-1.85.0-MinGW-v8.1-v11.2.7z">Boost-1.85.0</a> working with <a href="http://www.mingw.org/">MinGW</a> <strong>8.1</strong>.</p></td>
99+
<td class="custd"><p>The recommended mainstream development environments are <a href="https://www.qt.io/download-open-source">Qt</a> <strong>5.15.2</strong> and <a href="https://archives.boost.io/release/1.88.0/source/boost_1_88_0.tar.gz">Boost-1.88.0</a> working with <a href="http://www.mingw.org/">MinGW</a> <strong>8.1</strong>.</p></td>
98100
</tr>
99101
</table>
100102

@@ -124,7 +126,7 @@ <h3>Support</h3>
124126
<h3>Added Support and Features</h3>
125127

126128
<ul>
127-
<p>The <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/Tests/">Sourceforge Tests</a> folder contains bleeding-edge efforts to translate and improve
129+
<p>The <a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-4.1-Stream/Tests/">Sourceforge Tests</a> folder contains bleeding-edge efforts to translate and improve
128130
scripts. Some past scripts may not be able to be eliminated easily or in fact be
129131
converted at all.</p>
130132
<p>Support for following technologies are <strong>added/enhanced</strong> in these streams:</p>
@@ -196,9 +198,9 @@ <h3>CPACK Packaging Issues - Not Finding DLL's</h3>
196198
<ul>
197199
<p><strong>$env:Path += "</strong>;C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\5.15.2\bin<strong>"</strong></p>
198200
</ul>
199-
<li>If you are using <strong>Qt 6.7.2</strong> (experimental only - It will only build specialised, experimental JT-ware versions at this stage. See <a href="sourceforge.net/projects/wsjt-x-improved/files/WSJT-X_v2.8.0/Source%20code/">WSJT-X Imoroved</a> as an example):</li>
201+
<li>If you are using <strong>Qt 6.8.x</strong> (experimental only - It will only build specialised, experimental JT-ware versions at this stage. See <a href="sourceforge.net/projects/wsjt-x-improved/files/WSJT-X_v2.8.0/Source%20code/">WSJT-X Imoroved</a> as an example):</li>
200202
<ul>
201-
<p><strong>$env:Path += "</strong>;C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\6.7.2\bin<strong>"</strong></p>
203+
<p><strong>$env:Path += "</strong>;C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\6.8.x\bin<strong>"</strong></p>
202204
</ul>
203205
</ul>
204206
<p>These paths could also be added to the main Windows system paths.</p>
@@ -212,10 +214,10 @@ <h3>CPACK Packaging Issues - Not Finding DLL's</h3>
212214
<strong>C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\5.15.2\bin</strong>
213215
</ul>
214216
<br/>
215-
<li>For <strong>Qt 6.7.2</strong> (Developmental):</li>
217+
<li>For <strong>Qt 6.8.x</strong> (Developmental):</li>
216218
<br/>
217219
<ul>
218-
<strong>C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\6.7.2\bin</strong>
220+
<strong>C:\Windows\SysWOW64\downlevel;C:\JTSDK64-Tools\tools\hamlib\qt\6.8.x\bin</strong>
219221
</ul>
220222
</ul>
221223
<br/>

docs/ver4/DG4-Build-LibUSB.html

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,10 @@ <h3>Step 4: Download the Source</h3>
118118
<ul>
119119
<li>Download the latest source by selecting Donwloads / Latest Source (tarball)</li>
120120
<li>Save this file to the MSYS2 src directory ( i.e. x:\JTSDK64-Tools\tools\msys64\home\&lt;user name&gt;\src )</li>
121-
<li><strong>Note:</strong> It is possible to use this command at the MSYS2 terminal prompt to download LibUSB: wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.tar.bz2</li>
121+
<li><strong>Note:</strong> It is possible to use this command at the MSYS2 terminal prompt to download LibUSB:&nbsp;</li>
122+
<ul>
123+
<li><strong>wget https://github.com/libusb/libusb/releases/download/v1.0.29/libusb-1.0.29.tar.bz2</strong></li>
124+
</ul>
122125
</ul>
123126
<p>Change to the directory that you have just downloaded this source package to from within a <strong>msys64</strong> shell::</p>
124127
<ul>
@@ -137,8 +140,22 @@ <h3>Step 4: Download the Source</h3>
137140
<h3>Step 5: Configure and build the LibUSB library</h3>
138141
<ul>
139142
<p>The following set of steps actually configures and builds the library.</p>
140-
<ul>
143+
<p>First you need to check that some of the resources are present to actually build the library</p>
144+
<ul>
141145
<li>Execute the following commands at the MSYS2 command prompt:</li>
146+
<ul>
147+
<li>ls -al</li>
148+
</ul>
149+
</ul>
150+
<p>Check to see that the file <strong>configure</strong> is provided. If not type:</p>
151+
<ul>
152+
<li><strong>./bootstrap.sh</strong></li>
153+
154+
</ul>
155+
156+
<p>Now you can build the actual libary</p>
157+
158+
<p>Execute the following commands at the MSYS2 command prompt:</p>
142159

143160
<ul>
144161
<li><strong>cd libusb-1.0.29</strong></li>
@@ -153,15 +170,15 @@ <h3>Step 5: Configure and build the LibUSB library</h3>
153170

154171
<p>The above command places all that is built into the subdirectory <strong>/tmp/libusb</strong> . This way the built libraries are easy to find.</p>
155172

156-
<li>Start the actual build and deployment with the following commands:</li>
173+
<p>Start the actual build and deployment with the following commands:</p>
157174

158175
<ul>
159176
<li><strong>make</strong></li>
160177

161178
<li><strong>make</strong><strong> </strong><strong>install</strong><strong> </strong></li>
162179
</ul>
163180
</ul>
164-
</ul>
181+
165182

166183
<h3>Complete</h3>
167184

0 commit comments

Comments
 (0)