To Version 3.4.1 - Final Clean-Ups

Author: hamlibdk

README.md

@@ -291,33 +291,6 @@ The following procedure (supplied by Joe K0OG) can be used to fix this problem:
 
 This will recreate the new profile and should permit successful builds.]
 
-### Pre-Requisite: Ensure that the Version.ini keys for Qt deployment match Qt versions available
-
-The **Versions.ini** file inside the *X:\JTSDK64-Tools\config* folder contains two keys that are 
-used to align the JTSDK Installer scripts to the Open Source versions of Qt that the Qt Maintainers 
-make available.
-
-The section of the **Versions.ini** file where these keys are found are shown below:
-
-**File:** Versions.ini
-```
-...
-#Set current Qt version
-qt5v=5.15.2
-qt6v=6.7.2
-...
-```
-
-There should not be a future need to change key *qt5v* away from Version 5.15.2 as it is unlikely 
-that the Qt Maintainers will ever make a Qt 5 version beyond Version 5.15.2 available to open source users.
-
-The Qt maintainers are constantly evolving and improving Qt releases in the Version 6 stream. It may be 
-necessary to align the *qt6v* key to the currently available Qt version. 
-
-- As at the time of document publication, the latest currently available Qt 6 version available to Open Source licensees is **Qt 6.7.2**.
-
-You will be advised on the [JTSDK@GROUPS.io](JTSDK Forum) forum should changes to any of these keys be necessary.
-
 ### Pre-Requisite: Ensure that the latest WSJT-X and/or JT-ware Release is deployed
 
 Due to changes within CMake from version 3.28.0 onwards, it may be necessary to have a current deployment of WSJT-X 
@@ -331,6 +304,17 @@ Obtain a current release version of your product from:
 
 **Install it so that it can be found in the search path.***
 
+**Update**
+
+As of **JTSDK 3.4.1** a folder **extras** now exists within **X:\JTSDK64-Tools\tools**.
+
+- i.e. x:\JTSDK64-Tools\tools\extras
+
+DLL's and other components thta may be missing during builds can be placed within that folder.
+
+The most common "missing" component needed to build WSJTX is **libgfortran-4.dll** . 
+This DLL may be copied and placed into that folder, negating the need for deployment of latest supplied installers.
+
 ### Step 1: Deploy the JTSDK64-3.4.1.exe Installer and any available Update Packages
 
 ** Note that these instructions assumes a fresh Windows 10 or 11 Virtual Machine is used **
@@ -435,14 +419,15 @@ i.e. [Qt][]5.15.2 requires the [MinGW][]8.1 toolchain.
 
 There is a document at https://hamlib-sdk.sourceforge.io/Qt/ADQT.html that is intended to be used 
 as a guide for Qt 5.15.2 from Archive Repos.
-
+************************************************************************************
 **This deployment must be performed manually.**
 
-You can also add a Qt 6 toolchain at the same time
-
-i.e. [Qt][]6.7.2 requires the [MinGW][]13.1 toolchain.
-
+**Manual deployments should typically be made to x:\JTSDK64-Tools\tools\Qt**
+************************************************************************************
+You must also deploy the matching toolchain for the MinGW Version 
 
+- [Qt][]6.7.2 requires the [MinGW][]8.1 toolchain.
+- [Qt][]6.7.2 requires the [MinGW][]13.1 toolchain.
 ************************************************************************************
 
 - A Qt toolchain is required. Select 'Y'

docs/Qt/_notes/dwsync.xml

@@ -17,4 +17,11 @@
 <file name="Qt-Step-5d.jpg" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572922580000000" remote="133572922580000000" Dst="1" />
 <file name="Qt-Step-5e-U.jpg" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575271060000000" remote="133575271060000000" Dst="1" />
 <file name="Qt-Step-5e.jpg" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572922580000000" remote="133572922580000000" Dst="1" />
+<file name="ADQT.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133655017780000000" remote="133726604090000000" Dst="2" />
+<file name="ALLQT.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575419450000000" remote="133726604090000000" Dst="2" />
+<file name="BDQT.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575427190000000" remote="133726604100000000" Dst="2" />
+<file name="indexQt.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575723610000000" remote="133726604110000000" Dst="2" />
+<file name="navQt.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133574000160000000" remote="133726604110000000" Dst="2" />
+<file name="QUQT.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575724020000000" remote="133726604120000000" Dst="2" />
+<file name="UDQT.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575419440000000" remote="133726604130000000" Dst="2" />
 </dwsync>

docs/_notes/dwsync.xml

@@ -7,4 +7,6 @@
 <file name="nav.js" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133322758370000000" remote="133322758370000000" Dst="1" />
 <file name="UGIcon.png" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="132865338500000000" remote="132865338500000000" Dst="1" />
 <file name="Webb-First-Resize.jpg" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133021620790000000" remote="133021620790000000" Dst="1" />
+<file name="index.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133575725930000000" remote="133726604240000000" Dst="2" />
+<file name="style-new.css" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572922540000000" remote="133726604240000000" Dst="2" />
 </dwsync>

docs/ver3/DG3.html

@@ -237,19 +237,18 @@ <h4>Deployment</h4>
 		<ul><li>Select &#39;Y&#39; .</li>
 		</ul>
 	</ul>
-	<div class="reducewidth">
+<div class="reducewidth">
 <pre>
 (required) Qt (Y|N) ...................:
 </pre>
-	</div>
-	<ul>
-		</div>
-	<ul>
+</div>
+<ul>
+
 	<p><strong>Note</strong>: Qt 5.15.2 is <strong>NO LONGER AVAILABE THROUGH MAINSTREAM REPOSITORIES</strong>.</p>
     <p>Qt 5.15.2 and any later versions, plus their support tools (i.e. MinGW 8.1, MinGW 13.1) must be deployed manually. Qt 5.15.2 must be deployed from &quot;Archive&quot; repositories......................</p>
     <p>As it is impractical to script deployment from Archive repos, scripted deployments have been removed. One must manually deploy Qt and its components.</p></ul><div class="reducewidth">
 <pre>
-(required) MSYS2 Setup (Y|N) .........:
+(required) MSYS2 Setup (Y|N) ..........:
 </pre>
 </div>
 	<ul>
@@ -260,7 +259,7 @@ <h4>Deployment</h4>
 </ul>
 	<div class="reducewidth">
 <pre>
-(optional) VS Code (Y|N) .............:
+(optional) VS Code (Y|N) ..............:
 </pre> </div>
 	<ul>
 	<p><a href="https://code.visualstudio.com/">Visual Studio Code</a> is an optional component. VS Code is an excellent editor for working with 
@@ -291,30 +290,30 @@ <h4>Deployment</h4>
 </ul>
 
 <table width="*" align="center" border="1">
-		<tr>
-			<td class="custd"><strong>Follow on-screen prompts carefully.</strong></td>
-		</tr>
+	<tr>
+		<td class="custd"><strong>Follow on-screen prompts carefully.</strong></td>
+	</tr>
 </table>
-		<br/>
-		<table width="*" align="center" border="1">
-		<br/>
-		<tr>
-			<td class="custd"><strong>Manual intevention with installation programs will be required.</strong></td>
-		</tr>
+<br/>
+<table width="*" align="center" border="1">
+	<tr>
+		<td class="custd"><strong>Manual intevention with installation programs will be required.</strong></td>
+	</tr>
 </table>
-		<br/>
-		<table width="*" align="center" border="1">
-		<tr>
-			<td class="custd"><strong>If anything goes wrong RE-START the postinstall script, selecting 'N' to the option that failed.</strong></td>
-		</tr>
-	</table>
-	<ul>
+<br/>
+<table width="*" align="center" border="1">
+	<tr>
+		<td class="custd"><strong>If anything goes wrong RE-START the postinstall script, selecting 'N' to the option that failed.</strong></td>
+	</tr>
+</table>
+<ul>
       <p>Refer any installation issues issues to the <a href="https://groups.io/g/JTSDK">JTSDK Forum</a></p>
-	</ul>
+</ul>
 </ul>
 <h4>Note: Deploying Qt</h4> 
 <ul>
 	<p>A set of resources for deploying Qt 5.15.2 is available at <a href="https://hamlib-sdk.sourceforge.io/Qt/indexQt.html">https://hamlib-sdk.sourceforge.io/Qt/indexQt.html</a></p>
+	<p><strong>Qt must be deployed to <u>x:\JTSDK64-Tools\tools\Qt</u></strong></p>
 	<p>The resource <a href="https://hamlib-sdk.sourceforge.io/Qt/UDQT.html">https://hamlib-sdk.sourceforge.io/Qt/UDQT.html</a> details how to deploy Qt 5.15.2 from Archive.</p> 
 </ul><h4>Step 2a: Prepare the MSYS2 Environment</h4>
 <ul>
@@ -414,34 +413,31 @@ <h3>Step 3: Set Up The Main Tools Environment</h3>
 		</ul>
 </ul>
 
-	<h4>Step 3a: Upgrade your Qt Deployment</h4>
+	<h4>(Optional) Step 3a: Upgrade your Qt Deployment</h4>
 	<ul> 
 <p>As of March 2024 it has been observed that <strong>Qt 5.15.2</strong> is no longer available from "Mainstream" installer sources</p>
 <table width="*" align="center" border="1">
 		<tr>
 			<td class="custd"><strong>Qt 5.15.2 is still available from "Archive" ast the time of writing. This means that Qt must be deployed manually from "Archive" Repositories</strong></td>
 		</tr>
 	</table>
-<p>Earlier in the guide it was recommended that one performs a "Full" deployment of Qt at install time.</p>
-<p>This should properly deploy <strong>Qt 6.7.2</strong> along with its <strong>MinGW 13.1.0</strong> components and the <strong>Qt Maintenance Tool</strong>.&nbsp;</p>
-<p>Once the JTSDK is deployed you can then add <strong>Qt 5.15.2</strong> MANUALLY from Archive.&nbsp;</p>
+<p>By this stage you should already have Qt deployed</p>
+<p>Yoiu can add additional kits such as <strong>Qt 6.7.2</strong> along with its <strong>MinGW 13.1.0</strong> components and the <strong>Qt Maintenance Tool</strong>.&nbsp;</p>
 <table width="*" align="center" border="1">
 		<tr>
 			<td class="custd"><strong>See the guide <a href="https://sourceforge.net/projects/hamlib-sdk/files/JTware-Deployment/Deploying-Archived-Versions-of-Qt-via-Maintenance-Tool.docx">https://sourceforge.net/projects/hamlib-sdk/files/JTware-Deployment/Deploying-Archived-Versions-of-Qt-via-Maintenance-Tool.docx</a> for latest instructions</strong></td>
 		</tr>
 	</table>
 </ul>
 
+	
+	  <p><strong>Example: Adding additional Qt Kits</strong></p>
 	<ul>
-	  <p>A Minimum Qt installation pegs at <a href="https://www.qt.io/download-open-source">Qt</a> at version <strong>5.15.2</strong>. If you did not use 
-	  the &quot;F&quot; Full option for <a href="https://www.qt.io/download-open-source">Qt</a> deployment or you 
-	  want to update Qt to an experimental version you should do so now. 
-	  Note that using Qt <strong>5.15.2</strong> is the only Qt version that JT-ware source supports at this time.</p>
 	  <p>Perform the following steps:</p>
 		<ul>
 		  	<li>Navigate to the Qt Deployment directory</li>
 
-			<li>Run the <strong>Qt Maintenance Tool</strong> from your Qt deployment directory (i.e. <strong>C:\JTASK64-Tools\tools\Qt</strong>)</li>
+			<li>Run the <strong>Qt Maintenance Tool</strong> from your Qt deployment directory (i.e. <strong>C:\JTSK64-Tools\tools\Qt</strong>)</li>
 		</ul>
 		<p>To add <strong>Qt 6.7.2</strong> (as an example):</p>
 		<ul>

docs/ver3/UG3.html

@@ -414,19 +414,19 @@ <h4>Deployment</h4>
 	<p>During this phase some tools will require some interaction at the keyboard or via the 
 	mouse (especially the Qt deployment as one MUST now have their own account and agree 
 	to their licensing terms).</p>
-	</ul>
+</ul>
 
 <table width="*" align="center" border="1">
-		<tr>
-			<td class="custd"><strong>Follow on-screen prompts carefully.</strong></td>
-		</tr>
-	</table>
-		<br/>
-		<table width="*" align="center" border="1">
-		<br/>
-		<tr>
-			<td class="custd"><strong>Manual intevention with installation programs will be required.</strong></td>
-		</tr>
+	<tr>
+		<td class="custd"><strong>Follow on-screen prompts carefully.</strong></td>
+	</tr>
+</table>
+<br/>
+<table width="*" align="center" border="1">
+		
+  <tr>
+	<td class="custd"><strong>Manual intevention with installation programs will be required.</strong></td>
+  </tr>
 </table>
 		<br/>
 		<table width="*" align="center" border="1">
@@ -441,6 +441,7 @@ <h4>Deployment</h4>
 <h4>Note: Deploying Qt</h4> 
 <ul>
 	<p>A set of resources for deploying Qt 5.15.2 is available at <a href="https://hamlib-sdk.sourceforge.io/Qt/indexQt.html">https://hamlib-sdk.sourceforge.io/Qt/indexQt.html</a></p>
+	<p><strong>Qt MUST be deployed to <u>x:\JTSDK64-Tools\tools\Qt</u></strong> .</p>
 	<p>The resource <a href="https://hamlib-sdk.sourceforge.io/Qt/UDQT.html">https://hamlib-sdk.sourceforge.io/Qt/UDQT.html</a> details how to deploy Qt 5.15.2 from Archive.</p> 
 </ul>
 <h4>Step 2a: Prepare the MSYS2 Environment</h4>
@@ -543,34 +544,31 @@ <h3>Step 3: Set Up The Main Tools Environment</h3>
 		</ul>
 </ul>
 
-<h4>Step 3a: Upgrade your Qt Deployment</h4>
+	<h4>(Optional) Step 3a: Upgrade your Qt Deployment</h4>
 	<ul> 
 <p>As of March 2024 it has been observed that <strong>Qt 5.15.2</strong> is no longer available from "Mainstream" installer sources</p>
 <table width="*" align="center" border="1">
 		<tr>
 			<td class="custd"><strong>Qt 5.15.2 is still available from "Archive" ast the time of writing. This means that Qt must be deployed manually from "Archive" Repositories</strong></td>
 		</tr>
 	</table>
-<p>Earlier in the guide it was recommended that one performs a "Full" deployment of Qt at install time.</p>
-<p>This should properly deploy <strong>Qt 6.7.2</strong> along with its <strong>MinGW 13.1.0</strong> components and the <strong>Qt Maintenance Tool</strong>.&nbsp;</p>
-<p>Once the JTSDK is deployed you can then add <strong>Qt 5.15.2</strong> MANUALLY from Archive.&nbsp;</p>
+<p>By this stage you should already have Qt deployed</p>
+<p>Yoiu can add additional kits such as <strong>Qt 6.7.2</strong> along with its <strong>MinGW 13.1.0</strong> components and the <strong>Qt Maintenance Tool</strong>.&nbsp;</p>
 <table width="*" align="center" border="1">
 		<tr>
 			<td class="custd"><strong>See the guide <a href="https://sourceforge.net/projects/hamlib-sdk/files/JTware-Deployment/Deploying-Archived-Versions-of-Qt-via-Maintenance-Tool.docx">https://sourceforge.net/projects/hamlib-sdk/files/JTware-Deployment/Deploying-Archived-Versions-of-Qt-via-Maintenance-Tool.docx</a> for latest instructions</strong></td>
 		</tr>
 	</table>
 </ul>
 
+	
+	  <p><strong>Example: Adding additional Qt Kits</strong></p>
 	<ul>
-	  <p>A Minimum Qt installation pegs at <a href="https://www.qt.io/download-open-source">Qt</a> at version <strong>5.15.2</strong>. If you did not use 
-	  the &quot;F&quot; Full option for <a href="https://www.qt.io/download-open-source">Qt</a> deployment or you 
-	  want to update Qt to an experimental version you should do so now. 
-	  Note that using Qt <strong>5.15.2</strong> is the only Qt version that JT-ware source supports at this time.</p>
 	  <p>Perform the following steps:</p>
 		<ul>
 		  	<li>Navigate to the Qt Deployment directory</li>
 
-			<li>Run the <strong>Qt Maintenance Tool</strong> from your Qt deployment directory (i.e. <strong>C:\JTASK64-Tools\tools\Qt</strong>)</li>
+			<li>Run the <strong>Qt Maintenance Tool</strong> from your Qt deployment directory (i.e. <strong>C:\JTSK64-Tools\tools\Qt</strong>)</li>
 		</ul>
 		<p>To add <strong>Qt 6.7.2</strong> (as an example):</p>
 		<ul>

docs/ver3/_notes/dwsync.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <dwsync>
-<file name="UG3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133724914821793432" remote="133724915060000000" Dst="1" />
+<file name="UG3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133726616957432559" remote="133726617260000000" Dst="2" />
 <file name="QU3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133724918132776996" remote="133724918210000000" Dst="1" />
-<file name="DG3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133724914496585390" remote="133724915050000000" Dst="1" />
+<file name="DG3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133726616111051466" remote="133726617250000000" Dst="2" />
 <file name="DG3-Build-x64-JT-ware.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133712992168511437" remote="133713007630000000" Dst="1" />
 <file name="DG3-Build-LibUSB.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133712992168185894" remote="133713007640000000" Dst="1" />
 <file name="DG3-Build-Boost.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133712992167325977" remote="133713007640000000" Dst="1" />
@@ -13,4 +13,6 @@
 <file name="DO3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133514038770000000" remote="133514038770000000" Dst="1" />
 <file name="index3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133542444470000000" remote="133542444470000000" Dst="1" />
 <file name="nav3.js" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133492673660000000" remote="133492673660000000" Dst="1" />
+<file name="DG3-Build-General.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133657118460000000" remote="133726604140000000" Dst="2" />
+<file name="nav3.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133584120400000000" remote="133726604150000000" Dst="2" />
 </dwsync>

docs/ver4/_notes/dwsync.xml

@@ -2,4 +2,12 @@
 <dwsync>
 <file name="index4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572831680000000" remote="133572831680000000" Dst="1" />
 <file name="nav4.js" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133292334210000000" remote="133292334210000000" Dst="1" />
+<file name="AN4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133553831450000000" remote="133726604170000000" Dst="2" />
+<file name="DG4-Build-x64.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572103870000000" remote="133726604180000000" Dst="2" />
+<file name="DG4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572102140000000" remote="133726604180000000" Dst="2" />
+<file name="DO4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572102130000000" remote="133726604190000000" Dst="2" />
+<file name="nav4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572103310000000" remote="133726604200000000" Dst="2" />
+<file name="nav4.php" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133553845460000000" remote="133726604200000000" Dst="2" />
+<file name="QU4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572102120000000" remote="133726604210000000" Dst="2" />
+<file name="UG4.html" server="web.sourceforge.net//home/project-web/hamlib-sdk/htdocs/" local="133572102110000000" remote="133726604220000000" Dst="2" />
 </dwsync>

tools/setup/qt/Install-Qt.ps1

@@ -49,9 +49,7 @@ function InstallQt($script) {
 	Write-Host "-----------------------------------------------------"
 	Write-Host " Qt Installation"
 	Write-Host "-----------------------------------------------------"
-	Write-Host ""
-	Write-Host "* Downloading latest Qt Installer"
-	Write-Host ""
+	# Write-Host ""
 	Invoke-Expression -Command $PSScriptRoot\Download-QtInstaller.ps1
 
 	#Deal with 	Online Installer unable to be downloaded
@@ -64,6 +62,8 @@ function InstallQt($script) {
 		InstallError($msg)
 	}
 
+	Write-Host ""
+	
 	# Check to see that Qt is not already installed
 	Write-Host "* Check if Qt already installed"
 
@@ -82,6 +82,8 @@ function InstallQt($script) {
 		$cmd = "$QT_INSTPROG $QT_SOURCE"
 	}
 
+	Write-Host ""
+	
 	$exitCode = Invoke-Command -ScriptBlock { cmd /c $cmd *> $null; return $LASTEXITCODE }
 	# A proper exit returns 1 at the moment ... crazy !
 	IF ($LASTEXITCODE -eq 1) {