Skip to content

Commit 656c0b2

Browse files
hamlibdkhamlibdk
committed
To 4.0.0 Minor tweaks in Qt Deployment Scripts
1 parent f96742c commit 656c0b2

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

‎config/Versions.ini‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ libusbdll=/bin
88
# Next specifies path of VC runtimes
99
vcrunurl=https://aka.ms/vs/17/release
1010
# Next specifies the name of the Qt Installer
11-
qtinstprog=qt-unified-windows-x64-online.exe
11+
#q**tinstprog=qt-unified-windows-x64-online.exe
12+
qtinstprog=qt-online-installer-windows-x64-online.exe
1213
# Next specifies the Qt download mirror to use. Nothing after = means use pool
13-
qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org
14+
qtsource=http://www.nic.funet.fi/pub/mirrors/download.qt-project.org/official_releases/online_installers
15+
#q**tsource=https://download.qt.io/official_releases/online_installers
1416
nsisv=3.09
1517
pkgconfigv=2.1.0
1618
rubyv=3.4.2-1

‎docs/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,14 @@ <h2>Evolving the JT-ware Software Developer's Kit (JTSDK)</h2>
4343
<td width="16.6%" align="center"><a href="./Qt/indexQt.html">JTSDK Qt Guide</a></td>
4444
<td width="16.6%" align="center"><a href="https://groups.io/g/JTSDK">JTSDK Forum</a></td>
4545
<td width="16.5%" align="center"><a href="https://sourceforge.net/projects/hamlib-sdk/">Sourceforge</a></td>
46-
<td width="16.7%" align="center"><a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-3.2-Stream/">Download</a</td>
46+
<td width="16.7%" align="center"><a href="https://sourceforge.net/projects/hamlib-sdk/files/Windows/JTSDK-4.0-Stream/">Download</a</td>
4747
</tr>
4848
</table>
4949
<hr/>
5050
<h3>Introduction.</h3>
5151
<ul>
52-
<p>Development of <a href="./ver3/index3.html">Version 3</a> of the Hamlib SDK (JTSDK) has concluded.</p>
53-
<p>Development of <a href="./ver4/index4.html">Version 4</a> of the Hamlib SDK (JTSDK) has actively commenced.</p>
52+
<p>Development of <a href="./ver4/index4.html">Version 4</a> of the Hamlib SDK (JTSDK) is now current.</p>
53+
<p>Development of <a href="./ver3/index3.html">Version 3</a> of the Hamlib SDK (JTSDK) has concluded and further maintenance will not occur.</p>
5454
<p>This page links to both the <a href="./ver3/index3.html">Version 3</a> and <a href="./ver4/index4.html">Version 4</a> Kit documentation.</p>
5555
<p><a href="./ver4/index4.html">Version 4</a> of the JTSDK/Hamlib SDK is Qt 6.x centric - but will support Archived Deployments of <a href="https://www.qt.io/blog/qt-5.15.2-released">Qt 5.15.2</a></p>
5656
<p>Please watch this space !</p>

‎tools/setup/qt/Download-QtInstaller.ps1‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#-----------------------------------------------------------------------------#
22
# Name .........: Download-QtInstaller.ps1
33
# Project ......: Part of the JTSDK64 Tools Project
4-
# Version ......: 3.2.2.4
4+
# Version ......: 4.0.1
55
# Description ..: Downloads the latest Qt Installer
66
# Usage ........: Call this file directly from the command line
77
#
@@ -17,21 +17,23 @@ Set-Location -Path $PSScriptRoot
1717

1818
# Process variables
1919

20-
# dir$app = "curl"
21-
$appName="qt-unified-windows-x64-online.exe"
22-
$appURL="https://download.qt.io/official_releases/online_installers/qt-unified-windows-x64-online.exe"
20+
Get-Content $env:JTSDK_VC | foreach-object -begin {$configTable=@{}} -process { $k = [regex]::split($_,'='); if(($k[0].CompareTo("") -ne 0) -and ($k[0].StartsWith("[") -ne $True)) { $configTable.Add($k[0], $k[1]) } }
21+
$QT_INSTPROG = $configTable.Get_Item("qtinstprog")
22+
$QT_SOURCE = $configTable.Get_Item("qtsource")
23+
24+
# $appURL="https://download.qt.io/official_releases/online_installers/qt-unified-windows-x64-online.exe"
25+
26+
$appURL="$QT_SOURCE/$QT_INSTPROG"
27+
2328
#$param = "-o $appName -J -L $appURL"
2429

2530
#Write-Host " "
2631
Write-Host "* Downloading Qt Installer"
2732
Write-Host " "
28-
Write-Host " --> Downloading the latest Qt Installer"
29-
# Write-Host " Using Curl."
30-
31-
# DOS Command: curl -o %app_name% -J -L %app_url
32-
# Using CURL Installation: Start-Process -FilePath $app -ArgumentList $param
33+
# Write-Host " --> Downloading the latest Qt Installer"
34+
Write-Host " --> URL: $appURL"
3335

34-
Invoke-RestMethod -Uri $appURL -Method Get -OutFile $appName
36+
Invoke-RestMethod -Uri $appURL -Method Get -OutFile $QT_INSTPROG
3537

3638
Write-Host " --> Qt Installer Download Complete"
3739
Write-Host " "

‎tools/setup/qt/Install-Qt.ps1‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#-----------------------------------------------------------------------------#
22
# Name .........: Install-Qt.ps1
33
# Project ......: Part of the JTSDK64 Tools Project
4-
# Version ......: 4.0.0a
4+
# Version ......: 4.0.1
55
# Description ..: Installs Qt for Windows tailored for JT- Applications
66
#
77
# Usage ........: Call this from jtsdk64-tools-setup => Install-Qt.ps1 [option]
@@ -22,6 +22,7 @@
2222
# Set option for manual Qt deployment Coordinated by Steve VK3VM 29-9-2024
2323
# Minor output and documntation tweaks Coordinated by Steve VK3VM 29-9-2024
2424
# Start 0f 4.0 stream - re-enable scripted deploy to x:\ not x:\JTSDK64-Tools\tools by Steve VK3VM 02-12-2024
25+
# Fix for new Qt Name [ & fixes bug ] coordinated by Steve VK3VM 2025-03-24
2526
#
2627
#-----------------------------------------------------------------------------#
2728

@@ -56,7 +57,7 @@ function InstallQt($script) {
5657

5758
#Deal with Online Installer unable to be downloaded
5859

59-
$exe = "$PSScriptRoot\qt-unified-windows-x64-online.exe"
60+
$exe = "$PSScriptRoot\$QT_INSTPROG"
6061
if (Test-Path $exe) {
6162
Write-Host " --> Validated download of installer `[$exe`]"
6263
} else {

0 commit comments

Comments
 (0)