- The JTSDK 3.4.0 evolves the kits from Windows Batch Files towards Windows
+
The JTSDK 3.4.1 evolves the kits from Windows Batch Files towards Windows
PowerShell-based scripts. PowerShell is also supported in Mac and
Linux environs, so common-adaptation for these purposes may occur as the kits evolve.
This started as an experiment to reduce maintenance (i.e. new package versions).
@@ -51,12 +51,12 @@
The Parent: Version 3.2 Base Stream
The parent Version 3.2 stream is a learning, discovery and technique refinement experiment. Subsequent versions are an evolution from this.
-Version 3.4.0
+Version 3.4.1
- The JTSDK 3.4.0 outwardly will appear similar to previous JTSDK Version 3-stream releases. Yet the JTSDK 3.4.0 has significant updates and enhancements in that many of the key commands now accept
+
The JTSDK 3.4.1 outwardly will appear similar to previous JTSDK Version 3-stream releases. Yet the JTSDK 3.4.1 has significant updates and enhancements in that many of the key commands now accept
switches that can make the process of developing code quicker and simpler.
- The JTSDK 3.4.0 also moves away from PowerShell Windows 5.1 (The default MS-Windows-supplied version - also referred to as "PowerShell Core") to more contemporary release versions.
-The JTSDK 3.4.0 solves a long standing issue with LibUSB support - that up until now has been
+
The JTSDK 3.4.1 also moves away from PowerShell Windows 5.1 (The default MS-Windows-supplied version - also referred to as "PowerShell Core") to more contemporary release versions.
+The JTSDK 3.4.1 solves a long standing issue with LibUSB support - that up until now has been
disabled. Most changes in this preview incorporate enhancements to the MSYS2 environment
to better support the LibUSB with Hamlib.
@@ -147,7 +147,7 @@ Windows Environment Variables
Upgrades
- The JTSDK64-3.4.0 can be installed over the top of previous kits - yet it is
+
The JTSDK64-3.4.1 can be installed over the top of previous kits - yet it is
highly recommended that one start from scratch.
It is highly recommended that kits are deployed into Virtual machines (see "Deployment" section).
It is highly recommended that a new, fresh deployment be considered with each new base package release.
@@ -158,7 +158,7 @@ Upgrades
Maintenance Updates
- Maintenance updates will be applied in the form of "Update" packages. The current update to the JTSDK64-3.4.0 is JTSDK64-3.4.0-U2.exe .
+ Maintenance updates will be applied in the form of "Update" packages. There is no current update package available. The first update to the JTSDK64-3.4.1 would be JTSDK64-3.4.1-U1.exe .
Note: Maintainers are no longer supporting the "Base" and "Tools" nomenclature.
@@ -175,7 +175,7 @@ Maintenance Updates
- Note: The current update package is JTSDK64-3.4.0-U2.exe.
+ Note: There is no current update package.
- Deploy the tools package to your JTSDK install directory (typically X:\JTSDK64-Tools).
@@ -233,12 +233,12 @@ Pre-Requisite: Ensure that the latest WSJT-X and/or JT-ware Release is deplo
Install the base package so that it can be found in the Windows search path.
-Step 1: Deploy the JTSDK64-3.4.0.exe Installer and any update packages should they exist
+Step 1: Deploy the JTSDK64-3.4.1.exe Installer and any update packages should they exist
Note that these instructions assumes a fresh Windows 11 Virtual Machine is used
It is recommended to use all the default settings and file locations provided by the installer.
@@ -251,28 +251,25 @@ Special Note for Windows 11, Tools Packages and VC Runtimes Deployment
-------------------------------------------
- JTSDK Setup v3.4.0.2
+ JTSDK Setup v3.4.1
-------------------------------------------
Required Tools
- PowerShell ..... 5.1.22621.2506
- VC Runtimes .... Installed
- Git ............ Installed
- OmniRig ........ Installed
+ PowerShell ..... 5.1.22621.4249
+ VC Runtimes .... Not Installed
+ Git ............ Not Installed
+ OmniRig ........ Not Installed
- Qt Script-Provisioned Tool Chains
+ Qt Tool Chain(s) Deployed
- x64:
- MinGW 8.1 ...... Qt Not Installed
- MinGW 11.x ..... Qt Not Installed
+ Qt: None
- x86 (Legacy: unsupported):
- MinGW 8.1 ...... Qt Not Installed
+ Tools: None
Optional Components
- VS Code ........ Installed
+ VS Code ........ Not Installed
Boost .......... Not Installed
Post Install / Manual Setup Commands
@@ -297,6 +294,7 @@ Special Note for Windows 11, Tools Packages and VC Runtimes Deployment
It is highly recommended (for performance reasons) that you deploy the latest PowerShell Core .
In this example The .NET runtimes are not deployed.
+ Note: The system may try to reboot after deployment of each runtime package. Try to avoid this if you can.
@@ -353,21 +351,21 @@ Mainstream Deployment
At the prompts indicate which components you want to
install or redeploy.
- For VC Runtimes, OmniRig, Git, MSYS2 and VS Code use
+ For VC Runtimes, OmniRig, Git, MSYS2 and VS Code use:
--> Y/Yes or N/No
- For the Qt Install Selection:
-
- D / Y = Default ( minimal set of tools )
- F = Full ( full set of tools )
- N = Skip Installation
+ Qt deployment now just runs the Installer and/or
+ Maintenance Tool and no longer offers a scripted
+ deployment option. Use:
+ --> Y/Yes or N/No
- NOTE: VC Runtimes, Git, Qt and MSYS2 are mandatory to build
- JT-software. The Latest PowerShell is highly recommended.
+ NOTE: VC Runtimes, Git, Qt and MSYS2 are mandatory to
+ build JT-software. The Latest PowerShell is highly
+ recommended.
* Enter Your Install/Redeployment Selection(s):
- (optional) Latest PowerShell (Y|N) .:
+ (recommended) Latest PowerShell (Y|N) ...:
@@ -377,7 +375,7 @@ Mainstream Deployment
-(required) VC/C++ Runtimes (Y|N) ...:
+(required) VC/C++ Runtimes (Y|N) .....:
@@ -387,7 +385,7 @@ Mainstream Deployment
-(required) OmniRig (Y|N) ..........:
+(required) OmniRig (Y|N) .............:
@@ -397,7 +395,7 @@ Mainstream Deployment
-(required) Git-SCM (Y|N) ..........:
+(required) Git-SCM (Y|N) .............:
@@ -407,21 +405,25 @@ Mainstream Deployment
-(required) Default Qt (D/Y|F|N) ...:
+(required) (required) Qt (Y|N) ) .....................:
- Note: Qt 5.15.2 is NO LONGER AVAILABE THROUGH MAINSTREAM REPOSITORIES.
- Qt 5.15.2 must be deployed manually (from "Archive").
- The script for Qt deployment presents a number of options. 'D' or 'Y' Selects a scripted "Default"
- deployment being Qt 5.15.2 as the base (which now requires manual deployment - see note below). 'F' Deploys Qt 5.15.2 and 6.7.0 Qt 5.15.2 is the recommended version for JT-ware development.
-
- - Select 'Y'/'D' or 'F' (Note:'F' is now recommended as Qt 5.15.2 can only be obtained from "Archive" - which cannot be easily scripted. It must be deployed manually from the Maintenance Tool now. See later notes).
-
+ Note 1: The kit no longer provides options for scripted deployments.
+ Note 2: Qt 5.15.2 is NO LONGER AVAILABE THROUGH MAINSTREAM REPOSITORIES.
+ Any Qt deployment - especially Qt 5.15.2 - must be deployed manually. Qy 5.15.2 can only be deployed from "Archive" repositories.
+ Select 'Y'
+
-(required) MSYS2 Setup (Y|N) ......:
+(required) MSYS2 Setup (Y|N) ........:
@@ -431,7 +433,7 @@ Mainstream Deployment
-(optional) VS Code (Y|N) ..........:
+(optional) VS Code (Y|N) ............:
@@ -447,12 +449,13 @@ Mainstream Deployment
* Your Installation Selections:
- --> VC Runtimes .: Y
- --> OmniRig .....: Y
- --> Git .........: Y
- --> Qt ..........: Y
- --> MSYS2 .......: Y
- --> VS Code .....: Y
+ --> Latest PowerShell .....: Y
+ --> VC Runtimes ...........: Y
+ --> OmniRig ...............: Y
+ --> Git ...................: Y
+ --> Qt ....................: Y
+ --> MSYS2 .................: Y
+ --> VS Code ...............: Y
+
+
+
+ | Qt Deployment steps are not shown here. See the Qt Deployment Guide for deploying Qt 5.15.2 |
+
+
Step 2a: Prepare the MSYS2 Environment
@@ -563,30 +572,35 @@ Step 3a: Upgrade your Qt Deployment
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 |
- Earlier in the guide it was recommended that one performs a "Full" deployment of Qt at install time.
- This should properly deploy Qt 6.7.0 along with the Qt Maintenance Tool.
- Once the JTSDK is deployed you can then add Qt 5.15.2 MANUALLY from Archive.
+
+
+
+ | it is HIGHLY RECOMMENDED that the latest Qt from the Version 6.6 stream be used for JT-Ware Experiments |
+
+
+ Scripted deployment of Qt has now been removed from the kit. Qt and its associated MinGW tools must now be deployed manually.
+ This section will not detail how to deploy Qt. Qt deployment instructions (for the latest version) can be found at https://doc.qt.io/qt-6/windows-deployment.html .
- 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
- want to update Qt to an experimental version you should do so now.
- Note that using Qt 5.15.2 is the only Qt version that JT-ware source supports at this time.
- Perform the following steps:
+ Note: As a minimum, Qt 5.15.2. along with the MinGW 8.1 Toolset should be deployed.
+
+ Example: To add additional supported versions of Qt (i.e. from the 6.7-stream)
+ Perform the following steps:
+
- Navigate to the Qt Deployment directory
- Run the Qt Maintenance Tool from your Qt deployment directory (i.e. C:\JTASK64-Tools\tools\Qt)
- To add Qt 6.7.0 (as an example - later versions are now available):
+ To add Qt 6.7.2 (as an example - later versions may be available):
- - Add Qt 6.7.0 MinGW. [ Note that the packages may be named 'mingw900' but it is really MinGW 11.2 or later ]
- - Ensure that components Qt 6.7.0/MinGW 13.1.0 64 bit and Qt 6.7.0 Qt5 Compatability Module are added.
- - Select Qt 6.7.0/All Additional Libraries .
+ - Add Qt 6.7.2 MinGW. [ Note that the packages may be named 'mingw900' but it is really MinGW 11.2 or later ]
+ - Ensure that components Qt 6.7.2/MinGW 13.1.0 64 bit and Qt 6.7.2 Qt5 Compatability Module are added.
+ - Select Qt 6.7.2/All Additional Libraries .
- Add Developer and Designer Tools / MinGW 13.1.0 64-bit
- (Optional) Add the OpenSSL 1.1.1x toolkit (it helps with a WSJTX component downloads). Note: This may not be available now.
- (Optional) Add the OpenSSL 3.x.x toolkit (for future capabilities).
@@ -595,7 +609,7 @@ Step 3a: Upgrade your Qt Deployment
- Adjust the maker file in x:\JTSDK64-Tools\config marker file to match the Qt version that you want to use
- - i.e. rename qt5.15.2 to qt6.7.0
+ - i.e. rename qt5.15.2 to qt6.7.2
@@ -639,12 +653,12 @@ Step 3c: Deploy Boost for our selected Qt/MinGW Version.
Around 90 minutes later you should now have a deployment of Boost based at the recommended v1.85.0 (configurable in C:\JTSDK64-Tools\config\Versions.ini) that is suitable to build JT-software under your selected Qt version on your machine.
-Precompiled drop-in packages for Boost-1.74.0, Boost-1.84.0 and Boost-1.85.0 are available at the time of writing.
-Each “drop-in” package has folders i.e. 1.74.0-7.3 for MinGW 7.3 (pre-Qt 5.15) and 1.75.0-8.1 (for post-Qt 5.15 including the 6.x.x streams).
+Precompiled drop-in packages for Boost-1.85.0 are available at the time of writing.
+Each “drop-in” package has folders i.e. 1.85.0-8.1 and 1.85.0-11.1 (for post-Qt 5.15 including the 6.x.x streams).
- Extract the folder for the Boost version-package that you want to use into C:\JTSDK64-Tools\tools\boost (create the directory if it does not exist) and then remove the -7.3, -8.1 or -11.2 suffix.
-A Windows symbolic link will work too: i.e.: Assume that both the 1.82.0-8.1 and 1.82.0-11.2 distributions have been unpacked from Boost-1.82.0-MinGW-v8.1-v11.2.7z to C:\JTSDK64-Tools\tools\boost . Assume that the command shell or powershell windows are positioned at C:\JTSDK64-Tools\tools\boost
+A Windows symbolic link will work too: i.e.: Assume that both the 1.85.0-8.1 and 1.85.0-11.2 distributions have been unpacked from Boost-1.85.0-MinGW-v8.1-v11.2.7z to C:\JTSDK64-Tools\tools\boost . Assume that the command shell or powershell windows are positioned at C:\JTSDK64-Tools\tools\boost
- Cmd: mklink /D 1.85.0 1.85.0-8.1
- PowerShell: New-Item -ItemType SymbolicLink -Path C:\JTSDK64-Tools\tools\boost\boost-1.85.0 -Value C:\JTSDK64-Tools\tools\boost\boost-1.85.0-8.1
@@ -709,7 +723,7 @@ Additional Options for Developers
Both the jtbuild and build-hamlib- scripts now contain a number of switches that can be used to disable default features of the scripts.
Use the embedded help facilities to discover the currently available set of switches:
-i.e. 1: In The PowerShell Environment:
+i.e. 1: In The PowerShell Environment:
@@ -746,7 +760,7 @@ Additional Options for Developers
-i.e. 2: In The MSYS2 Environment:
+i.e. 2: In The MSYS2 Environment:
@@ -806,13 +820,13 @@ Conclusion and Further References
- | Original Author: Steve VK3VM/VK3SIR |
+ Editor: Steve VK3VM/VK3SIR |
Contact |
diff --git a/jtsdk64-setup.ps1 b/jtsdk64-setup.ps1
index af34d53..793d68b 100644
--- a/jtsdk64-setup.ps1
+++ b/jtsdk64-setup.ps1
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------::
# Name .........: jtsdk64-setup.ps1
# Project ......: Part of the JTSDK64 Tools Project
-# Version ......: 3.4.0b
+# Version ......: 3.4.1b
# Description ..: JTSDK64 Postinstall Setup Environment
# Project URL ..: https://github.com/KI7MT/jtsdk64-tools.git
# Usage ........: Call this file directly from the command line
@@ -31,21 +31,41 @@ function ConvertForward($inValue) {
return $inValue.replace(":","")
}
+# --- CENTER TEXT -------------------------------------------------------------
+# --> Writest text in the center of the line
+# --> Based off: https://stackoverflow.com/questions/48621267/is-there-a-way-to-center-text-in-powershell
+# --> if Width = 0 assumes buffer width
+# function Write-HostCenter { param($Message) Write-Host ("{0}{1}" -f (' ' * (([Math]::Max(0, $Host.UI.RawUI.BufferSize.Width / 2) - [Math]::Floor($Message.Length / 2)))), $Message) }
+function Write-HostCenter($Message, $width) {
+ if ( $width -eq 0 ) {
+ $bufferWidth = [Math]::Max(0, $Host.UI.RawUI.BufferSize.Width)
+ } else {
+ $bufferWidth = $width
+ }
+ $pad=""
+ For ($i=0; $i -le $bufferWidth/2; $i++) {
+ Write-Host -NoNewLine " "
+ }
+ Write-Host $Message
+}
+
+
+#------------------------------------------------------------------------------
+# GLOBAL ENVIRONMENT VARIABLES and PATHS
+#------------------------------------------------------------------------------
+
+# --- Main Paths --------------------------------------------------------------
+
$env:JTSDK64_VERSION = [IO.File]::ReadAllText($PSScriptRoot+"\ver.jtsdk")
$host.ui.RawUI.WindowTitle = 'JTSDK64 Tools Setup ' + $env:JTSDK64_VERSION
#Clear-Host
+# Write-HostCenter("Test", 12);
Write-Host "------------------------------------------------------------"
Write-Host " JTSDK64 Setup $env:JTSDK64_VERSION" -ForegroundColor Yellow
Write-Host "------------------------------------------------------------"
Write-Host ""
-#------------------------------------------------------------------------------
-# GLOBAL ENVIRONMENT VARIABLES and PATHS
-#------------------------------------------------------------------------------
-
-# --- Main Paths --------------------------------------------------------------
-
Write-Host "* Setting Environment Variables"
$env:JTSDK_HOME = $PSScriptRoot
$env:JTSDK_HOME_F = ConvertForward($env:JTSDK_HOME)
@@ -84,9 +104,6 @@ $env:VCRUNTIME_STATUS="Not Installed"
$env:GIT_STATUS="Not Installed"
$env:QTMAINT_STATUS="Not Installed"
$env:QTCREATOR_STATUS="Not Installed"
-$env:MinGW11x_STATUS="Not Installed"
-$env:MinGW81_STATUS="Not Installed"
-$env:MinGW81_32STATUS="Not Installed"
$env:VSCODE_STATUS="Not Installed"
$env:BOOST_STATUS="Not Installed"
$env:OMNIRIG_STATUS="Not Installed"
@@ -156,34 +173,39 @@ Write-Host "* Checking Qt deployment"
if (Test-Path "$env:JTSDK_TOOLS\Qt\MaintenanceTool.exe") { $env:QTMAINT_STATUS="Installed" }
if (Test-Path "$env:JTSDK_TOOLS\Qt\Tools\QtCreator\bin\qtcreator.exe") { $env:QTCREATOR_STATUS="Installed" }
-if (Test-Path "$env:JTSDK_TOOLS\Qt\[1-9]*\mingw73_64\bin") { $env:MinGW73_STATUS = Get-ChildItem $env:JTSDK_TOOLS\Qt\[1-9]*\mingw73_64\bin\Qt?Core.dll }
-$env:MinGW73_STATUS = $env:MinGW73_STATUS -replace "JTSDK64" -replace "Tools2" -replace "Tools3" -replace "mingw73_64" -replace "mingw73_32" -replace "Qt5Core.dll" -replace "Qt6Core.dll" -replace "[^\d\.\ ]" -replace (" ",", Qt ")
-if ($env:MinGW73_STATUS -eq ", Qt ") { $env:MinGW73_STATUS="Not Installed" }
-
-if (Test-Path "$env:JTSDK_TOOLS\Qt\[1-9]*\mingw81_64\bin") { $env:MinGW81_STATUS = Get-ChildItem $env:JTSDK_TOOLS\Qt\[1-9]*\mingw81_64\bin\Qt?Core.dll }
-$env:MinGW81_STATUS = $env:MinGW81_STATUS -replace "JTSDK64" -replace "Tools2" -replace "Tools3" -replace "mingw81_64" -replace "Qt5Core.dll" -replace "Qt6Core.dll" -replace "[^\d\.\ ]" -replace (" ",", Qt ")
-if ($env:MinGW81_STATUS -eq ", Qt ") { $env:MinGW81_STATUS="Not Installed" }
-
-if (Test-Path "$env:JTSDK_TOOLS\Qt\[1-9]*\mingw81_32\bin") { $env:MinGW81_32STATUS = Get-ChildItem $env:JTSDK_TOOLS\Qt\[1-9]*\mingw81_32\bin\Qt?Core.dll }
-$env:MinGW81_32STATUS = $env:MinGW81_32STATUS -replace "JTSDK64" -replace "Tools2" -replace "Tools3" -replace "JTSDK" -replace "mingw81_32" -replace "Qt5Core.dll" -replace "Qt6Core.dll" -replace "[^\d\.\ ]" -replace (" ",", Qt ")
-if ($env:MinGW81_32STATUS -eq ", Qt ") { $env:MinGW81_32STATUS="Not Installed" }
-
-if (Test-Path "$env:JTSDK_TOOLS\Qt\[1-9]*\mingw_64\bin") { $env:MinGW11x_STATUS = Get-ChildItem $env:JTSDK_TOOLS\Qt\[1-9]*\mingw_64\bin\Qt?Core.dll }
-$env:MinGW11x_STATUS = $env:MinGW11x_STATUS -replace "JTSDK64" -replace "Tools2" -replace "Tools3" -replace "mingw_64" -replace "Qt5Core.dll" -replace "Qt6Core.dll" -replace "[^\d\.\ ]" -replace (" ",", Qt ") -replace "64"
-if ($env:MinGW11x_STATUS -eq ", Qt ") { $env:MinGW11x_STATUS="Not Installed" }
+# $objList = Where-Object {$_.name -match "[\d+].[\d+].[\d+]?"} | select name
+# $objTest = Get-ChildItem C:\JTSDK64-Tools\Tools\Qt\Tools -filter "mingw*" -Directory
+# $objTest | ForEach-Object -process {$_.Name}
+$env:QtMinGWDeployed="None"
+if (Test-Path -path "$env:SystemDrive:\JTSDK64-Tools\Tools\Qt\Tools") {
+ Get-ChildItem "$env:SystemDrive:\JTSDK64-Tools\Tools\Qt\Tools" -filter "mingw*" -Directory | ForEach-Object -process {
+ if ( $env:QtMinGWDeployed -eq "None" ) { $env:QtMinGWDeployed = "" }
+ $env:QtMinGWDeployed=$env:QtMinGWDeployed + $_.Name + " "
+ }
+}
+$env:QtDeployed="None"
+if (Test-Path -path "$env:SystemDrive:\JTSDK64-Tools\Tools\Qt\Licenses" ) {
+ try {
+ Get-ChildItem "$env:SystemDrive:\JTSDK64-Tools\Tools\Qt\" | Where-Object {$_.name -match "[\d+].[\d+].[\d+]?"} | ForEach-Object -process {
+ if ( $env:QtDeployed -eq "None" ) { $env:QtDeployed = "" }
+ $env:QtDeployed=$env:QtDeployed + $_.name + " "
+ }
+ }
+ catch {
+ }
+}
# --- Complete ! --------------------------------------------------------------
Write-Host " "
Write-Host -ForegroundColor yellow "Note: PowerShell Windows 5.1 is preferred for Deployment."
Write-Host " "
-Write-Host "The environment for JTSDK deployment is now in place."
+Write-Host "* The environment for JTSDK deployment is now in place."
Write-Host " "
-#Read-Host -Prompt "*** Press [ENTER] to Launch JTSDK64-Setup Environment *** "
-$input = $(Write-Host -NoNewLine -ForegroundColor blue "*** Press [ENTER] to Launch JTSDK64-Setup Environment *** " ; Read-Host)
+$input = $(Write-Host -NoNewLine -ForegroundColor blue "*** Press [ENTER] to Launch JTSDK64-Setup Environment *** " ; Read-Host)
#------------------------------------------------------------------------------
# PRINT TOOL CHAN STATUS / CREATE INTERACTIVE POWERSHELL ENVIRON
@@ -204,14 +226,13 @@ invoke-expression 'cmd /c start powershell -NoExit -Command {
Write-Host " Git ............ $env:GIT_STATUS"
Write-Host " OmniRig ........ $env:OMNIRIG_STATUS"
Write-Host ""
- Write-Host " Qt Script-Provisioned Tool Chains" -ForegroundColor Yellow
+ Write-Host " Qt Tool Chain(s) Deployed" -ForegroundColor Yellow
Write-Host ""
- Write-Host " x64:" -ForegroundColor Green
- Write-Host " MinGW 8.1 ...... Qt $env:MinGW81_STATUS"
- Write-Host " MinGW 11.x ..... Qt $env:MinGW11x_STATUS"
+ Write-Host -NoNewLine " Qt: " -ForegroundColor Green
+ Write-Host "$env:QtDeployed"
Write-Host ""
- Write-Host " x86 (Legacy: unsupported):" -ForegroundColor Green
- Write-Host " MinGW 8.1 ...... Qt $env:MinGW81_32STATUS"
+ Write-Host -NoNewLine " Tools: " -ForegroundColor Green
+ Write-Host "$env:QtMinGWDeployed"
Write-Host ""
Write-Host " Optional Components" -ForegroundColor Yellow
Write-Host ""
diff --git a/jtsdk64.ps1 b/jtsdk64.ps1
index 3810525..24bc1a7 100644
--- a/jtsdk64.ps1
+++ b/jtsdk64.ps1
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------::
# Name .........: jtsdk64.ps1
# Project ......: Part of the JTSDK64 Tools Project
-# Version ......: 3.4.1 Beta
+# Version ......: 3.4.1
# Description ..: Main Development Environment Script
# Sets environment variables for development and MSYS2
# Original URL .: https://github.com/KI7MT/jtsdk64-tools.git
@@ -35,6 +35,7 @@
# : Inclusion of CMAKE config variables to fins LibUSB 14-7-2024 Steve I VK3VM
# : Major enhancements and removal of "Fudges" to hopefully support Qt 6.7 and MinGW 13.1 18-9-2024 Steve I VK3VM
# : Minor legacy bugfix with JTSDK_MSYS2_F fixed 18-9-2024 Steve I VK3VM
+# : (Non-ideal) Support for "extras" folder 2024-10-2 coordinated by Steve I VK3VM
#
#-----------------------------------------------------------------------------::
@@ -70,6 +71,15 @@ function CreateFolders {
New-Item -Path $env:JTSDK_TOOLS -Name "\scripts" -ItemType "directory" | Out-Null
Write-Host " --> Created $env:JTSDK_SCRIPTS"
}
+
+# Suppoort for Extras folder. Note that usage of this is frowned upon but may be necessary for some.
+# it is BETTER that one FIXES/RECOMPILES the package that needs additional DLL's as it is most
+# likely that some MS-compiler components are used in the library ... Recompile under MSYS2/MinGW
+
+ if (!(Test-Path "$env:JTSDK_TOOLS\extras")) {
+ New-Item -Path $env:JTSDK_TOOLS -Name "\extras" -ItemType "directory" | Out-Null
+ Write-Host " --> Created $env:JTSDK_TOOLS\extras"
+ }
}
# --- CONVERT FORWARD ---------------------------------------------------------
diff --git a/tools/scripts/Deploy-Boost.ps1 b/tools/scripts/Deploy-Boost.ps1
index a90e5ce..53f5dd2 100644
--- a/tools/scripts/Deploy-Boost.ps1
+++ b/tools/scripts/Deploy-Boost.ps1
@@ -39,6 +39,7 @@ function ErrorDetected($fnctn) {
# Main Logic
# ----------------------------------------------------------------------------
+Clear-Host
# Commence backup of original Path
if ( -Not ( Test-Path env:PATH_BKP ) ) { $env:PATH_BKP = $env:PATH }
# $env:PATH = $env:PATH +";" + $env:QT_JTSDK_PATH
@@ -50,12 +51,12 @@ $env:PATH = $env:PATH + ";" + $pwd.drive.name + ":\JTSDK64-Tools\tools\msys64\mi
# Note that this is ALREADY there ... It just moves it "higher up the foodchain"
# to prevent other compilers being detected and used first (i.e Visual Studio Compilers !
-$env:Path = "C:\JTSDK64-Tools\tools\Qt\Tools\$GCC_MINGW\bin;" + $env:Path
+$env:Path = $env:SystemDrive + "\JTSDK64-Tools\tools\Qt\Tools\" + $env:GCC_MINGW + "\bin;" + $env:Path
$scriptRoot = $PSScriptRoot # Save execution location
Set-Location -Path $env:JTSDK_HOME #Change to the JTSDK HOME Directory
-Clear-Host
+
Write-Host "-----------------------------------------------"
Write-Host " JTSDK64 Boost Deployment $env:JTSDK64_VERSION"
Write-Host "-----------------------------------------------"
diff --git a/tools/scripts/jtbuild.ps1 b/tools/scripts/jtbuild.ps1
index 5aaf268..5a8afb9 100644
--- a/tools/scripts/jtbuild.ps1
+++ b/tools/scripts/jtbuild.ps1
@@ -1,6 +1,6 @@
# -----------------------------------------------------------------------------
# Name ..............: jtbuild.ps1
-# Version ...........: 3.2.3.3
+# Version ...........: 3.4.1
# Description .......: Build script for WSJT-X, JTDX and JS8CALL
# Concept ...........: Greg, Beam, KI7MT,
# Author ............: JTSDK Contributors 20-01-2021 -> 10-09-2021
@@ -32,7 +32,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
#
-# : Amendment in technique for getting output package filename 9-10-1-2024 Steve VK3VM
+# : Amendment in technique for getting output package filename 2024-1-1-10 Steve VK3VM
+# : (Non-ideal) Support for "extras" folder 2024-10-2 coordinated by Steve VK3VM
#
#-----------------------------------------------------------------------------#
@@ -839,10 +840,18 @@ function GetVersionData ([ref]$rmav, [ref]$rmiv, [ref]$rpav, [ref]$rrcx, [ref]$r
# Rename-Item $env:JTSDK_TOOLS\msys64\usr\bin\sh-bak.exe $env:JTSDK_TOOLS\msys64\usr\bin\sh.exe | Out-Null
#}
-#EXPERIMENT
+# Set Paths -------------------------------------------------------------SET PATHS
+# this sets additional search paths that may be needed - especially for packaging
+
if ( -Not ( Test-Path env:PATH_BKP ) ) { $env:PATH_BKP = $env:PATH }
$env:PATH = $env:PATH +";" + $env:QT_JTSDK_PATH
+# Suppoort for Extras folder. Note that usage of this is frowned upon but may be necessary for some.
+# it is BETTER that one FIXES/RECOMPILES the package that needs additional DLL's as it is most
+# likely that some MS-compiler components are used in the library ... Recompile under MSYS2/MinGW
+$env:PATH = $env:PATH +";" + $env:JTSDK_TOOLS + "\extras"
+
+# Experiment
#Push-Location $env:JTSDK_TOOLS\msys64\usr\bin
#Rename-Item $env:JTSDK_TOOLS\msys64\usr\bin\sh.exe $env:JTSDK_TOOLS\msys64\usr\bin\sh-bak.exe | Out-Null
#Pop-Location
diff --git a/tools/setup/jtsdk64-postinstall.ps1 b/tools/setup/jtsdk64-postinstall.ps1
index 7b01abd..eae8b4f 100644
--- a/tools/setup/jtsdk64-postinstall.ps1
+++ b/tools/setup/jtsdk64-postinstall.ps1
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------#
# Name ........: jtsdk64-postinstall.ps1
# Project .....: HAMLIB SDK - JTSDK64 Tools Project
-# Version .....: 3.4.0.2
+# Version .....: 3.4.1
# Description .: Installs Components based on User selections
#
# Usage .......: Call from jtsdk64-tools-setup environ => jtsdk64-postinstall $*
@@ -58,17 +58,17 @@ function StartMessage {
Write-Host " At the prompts indicate which components you want to"
Write-Host " install or redeploy."
Write-Host ""
- Write-Host " For VC Runtimes, OmniRig, Git, MSYS2 and VS Code use"
+ Write-Host " For VC Runtimes, OmniRig, Git, MSYS2 and VS Code use:"
Write-Host " --> Y`/Yes or N`/No"
Write-Host ""
- Write-Host " For the Qt Install Selection:"
- Write-Host ""
- Write-Host " D / Y = Default ( minimal set of tools )"
- Write-Host " F = Full ( full set of tools )"
- Write-Host " N = Skip Installation"
+ Write-Host " Qt deployment now just runs the Installer and/or"
+ Write-Host " Maintenance Tool and no longer offers a scripted"
+ Write-Host " deployment option. Use:"
+ Write-Host " --> Y`/Yes or N`/No"
Write-Host ""
- Write-Host " NOTE: VC Runtimes, Git, Qt and MSYS2 are mandatory to build"
- Write-Host " JT-software. The Latest PowerShell is highly recommended."
+ Write-Host " NOTE: VC Runtimes, Git, Qt and MSYS2 are mandatory to"
+ Write-Host " build JT-software. The Latest PowerShell is highly"
+ Write-Host " recommended."
}
# ------------------------------------------------------------------- DISPLAY SELECTIONS
@@ -76,13 +76,13 @@ function DisplaySelections ($userInputPS, $userInputVCR, $userInputOmniRig, $use
Write-Host ""
Write-Host "* Your Installation Selections:"
Write-Host ""
- Write-Host " --> Latest PowerShell .............: $userInputPS"
- Write-Host " --> VC Runtimes ...................: $userInputVCR"
- Write-Host " --> OmniRig .......................: $userInputOmniRig"
- Write-Host " --> Git ...........................: $userInputGit"
- Write-Host " --> Qt ............................: $userInputQt"
- Write-Host " --> MSYS2 .........................: $userInputMsys2"
- Write-Host " --> VS Code .......................: $userInputVSCode"
+ Write-Host " --> Latest PowerShell ................: $userInputPS"
+ Write-Host " --> VC Runtimes ......................: $userInputVCR"
+ Write-Host " --> OmniRig ..........................: $userInputOmniRig"
+ Write-Host " --> Git ..............................: $userInputGit"
+ Write-Host " --> Qt ...............................: $userInputQt"
+ Write-Host " --> MSYS2 ............................: $userInputMsys2"
+ Write-Host " --> VS Code ..........................: $userInputVSCode"
Write-Host ""
}
@@ -91,14 +91,13 @@ function GetSelections([ref]$iPS, [ref]$iVCR, [ref]$iOmniRig, [ref]$iGit, [ref]$
Write-Host ""
Write-Host "* Enter Your Install/Redeployment Selection(s)`:"
Write-Host ""
-
- $iPS.value = Read-Host " (required) Latest PowerShell (Y|N) ."
- $iVCR.value = Read-Host " (required) VC/C++ Runtimes (Y|N) ..."
- $iOmniRig.value = Read-Host " (required) OmniRig (Y|N) ..........."
- $iGit.value = Read-Host " (required) Git-SCM (Y|N) ..........."
- $iQt.value = Read-Host " (required) Default Qt (D/Y|F|N) ...."
- $iMsys2.value = Read-Host " (required) MSYS2 Setup (Y|N) ......."
- $iVSCode.value = Read-Host " (optional) VS Code (Y|N) ..........."
+ $iPS.value = Read-Host " (recommended) Latest PowerShell (Y|N) ."
+ $iVCR.value = Read-Host " (required) VC/C++ Runtimes (Y|N) ......"
+ $iOmniRig.value = Read-Host " (required) OmniRig (Y|N) .............."
+ $iGit.value = Read-Host " (required) Git-SCM (Y|N) .............."
+ $iQt.value = Read-Host " (required) Qt (Y|N) ..................."
+ $iMsys2.value = Read-Host " (required) MSYS2 Setup (Y|N) .........."
+ $iVSCode.value = Read-Host " (optional) VS Code (Y|N) .............."
$iPS.value = $iPS.value.ToUpper()
$iVCR.value = $iVCR.value.ToUpper()
$iOmniRig.value = $iOmniRig.value.ToUpper()
@@ -171,38 +170,15 @@ function ProcessVSCode {
# ------------------------------------------------------------------- PROCESS Qt
function ProcessQt {
- $cmd = "$env:JTSDK_SETUP\qt\Generate-JSQt.ps1"
- $step = "QT Generate Script"
- Invoke-Expression "$cmd $param"
- if ($LASTEXITCODE -ne 0) { WriteErrorMessage($step) }
-
+ $install="Y"
+ $step = "Qt Manual Deployment"
$cmd = "$env:JTSDK_SETUP\qt\Install-Qt.ps1"
-
- # If option -eq D, install default (minimal) set of scripted Qt options
-
- if (($userInputQt -eq "D") -or ($userInputQt -eq "Y")) {
- $install="Y"
- $step = "QT Default Install"
- $param="min"
- Invoke-Expression "$cmd $param"
- if ($LASTEXITCODE -ne 0) { WriteErrorMessage($step) }
- Write-Host "* Removing pre-existing Qt Configration marker(s)"
- Get-ChildItem $env:JTSDK_CONFIG | Where{$_.Name -Match "qt*"} | Remove-Item
- Write-Host "* Setting Qt Configration marker [$defaultQt]"
- $tmpOut = $env:JTSDK_CONFIG + "\qt" + $defaultQt
- Out-File -FilePath $tmpOut
- }
-
- # If option -eq F, install full (basic) set of Scripted Qt options
-
- if ($userInputQt -eq "F") {
- $install="Y"
- $step = "QT Full Install"
- $param="full"
- Invoke-Expression "$cmd $param"
- if ($LASTEXITCODE -ne 0) { WriteErrorMessage($step) }
- Write-Host "* Using Tools-delivered Qt Configration marker --> Check that this is appropriate."
- }
+ $param="manual"
+ Invoke-Expression "$cmd $param"
+ if ($LASTEXITCODE -ne 0) { WriteErrorMessage($step) }
+ Write-Host "* Removing pre-existing Qt Configration marker(s) --> If they exist"
+ Get-ChildItem $env:JTSDK_CONFIG | Where{$_.Name -Match "qt*"} | Remove-Item
+ Write-Host "* Using Tools-delivered Qt Configration marker --> This will almost certainly need manual review."
}
# ------------------------------------------------------------------- PROCESS MSYS2
@@ -293,7 +269,7 @@ if ($userInputVSCode -eq "Y") {
ProcessVSCode
$install = "Y"
}
-if ($userInputQt -ne "N") {
+if ($userInputQt -eq "Y") {
ProcessQt
$install = "Y"
}
diff --git a/tools/setup/qt/Generate-JSQt.ps1 b/tools/setup/qt/Generate-JSQt.ps1
index 7c90796..2473b2b 100644
--- a/tools/setup/qt/Generate-JSQt.ps1
+++ b/tools/setup/qt/Generate-JSQt.ps1
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------#
# Name .........: Generate-JSQt.ps1
# Project ......: Part of the JTSDK64 Tools Project
-# Version ......: 3.4.0.2
+# Version ......: 4.0 Alpha
# Description ..: Downloads the latest Qt Installer
# Usage ........: Call this file directly from the command line
#
@@ -26,7 +26,6 @@
# Minor maintenance for Qt 6.5.1 Coordinated by Steve VK3VM 02-6-2023
# Bump to Version 4.0: Incorporation of QT5_VER and QT6_VER variables Coordinated by Steve VK3VM 04-6-2023
# --> The versions of Qt deployed now set inside Versions.ini. Maintenance now reduced.
-# Bump back to 3.4.0.2: Set so that Latest MinGW components are deployed Steve VK3VM 15-07-2024
#
#-----------------------------------------------------------------------------#
@@ -140,8 +139,6 @@ Add-Content $of " widget.selectComponent`(`"qt.tools.openssl.win_x64`"`)`;"
Add-Content $of " widget.selectComponent`(`"qt.tools.win64_mingw810`"`)`;"
#Add-Content $of " widget.selectComponent`(`"qt.qt5.5152.win64_mingw81`"`)`;"
Add-Content $of " widget.selectComponent`(`"qt.qt5.$qt5ver.win64_mingw81`"`)`;"
-Add-Content $of " widget.selectComponent`(`"qt.qt6.$qt6ver.win64_mingw112`"`)`;"
-Add-Content $of " widget.selectComponent`(`"qt.qt6.$qt6ver.win64_mingw131`"`)`;"
Add-Content $of " gui.clickButton`(buttons.NextButton`)`;"
Add-Content $of "`}"
Add-Content $of " "
diff --git a/tools/setup/qt/Install-Qt.ps1 b/tools/setup/qt/Install-Qt.ps1
index cf34e86..9c10a64 100644
--- a/tools/setup/qt/Install-Qt.ps1
+++ b/tools/setup/qt/Install-Qt.ps1
@@ -1,7 +1,7 @@
#-----------------------------------------------------------------------------#
# Name .........: Install-Qt.ps1
# Project ......: Part of the JTSDK64 Tools Project
-# Version ......: 3.2.3.2
+# Version ......: 3.4.1
# Description ..: Installs Qt for Windows tailored for JT- Applications
#
# Usage ........: Call this from jtsdk64-tools-setup => Install-Qt.ps1 [option]
@@ -9,16 +9,18 @@
# Concept ......: Greg, Beam, KI7MT,
# Author .......: HAMLIB SDK Contributors
# Copyright ....: Copyright (C) 2013 - 2021 Greg Beam, KI7MT
-# : Copyright (C) 2020 - 2023 HAMLIB SDK Contributors
+# : Copyright (C) 2020 - 2024 HAMLIB SDK Contributors
# License ......: GPLv3
#
-# Conversion and logic refactoring Steve VK3SIR 25-12-2020 - 18-1-2021
-# Updates for Qt 5.12.12 and 6.2.2 27-05-2021 - 6-1-2022
-# Updates for Qt 6.3.0 16-5-2022
-# Set Qt 5.12.2 and completely deprecate unavailable 5.12-stream Steve VK3VM 18-5-2022
-# References to Qt 5.12.x removed as no longer available Steve VK3VM 07-8-2022
-# References for Qt 6 deployment updated to Qt 6.5.0 Steve VK3VM 10-4-2023
-# References for Qt 6 deployment updated to Qt 6.5.1 Coordinated by Steve VK3VM 02-6-2023
+# Conversion and logic refactoring Steve VK3SIR 25-12-2020 - 18-1-2021
+# Updates for Qt 5.12.12 and 6.2.2 27-05-2021 - 6-1-2022
+# Updates for Qt 6.3.0 16-5-2022
+# Set Qt 5.12.2 and completely deprecate unavailable 5.12-stream Steve VK3VM 18-5-2022
+# References to Qt 5.12.x removed as no longer available Steve VK3VM 07-8-2022
+# References for Qt 6 deployment updated to Qt 6.5.0 Steve VK3VM 10-4-2023
+# References for Qt 6 deployment updated to Qt 6.5.1 Coordinated by Steve VK3VM 02-6-2023
+# Set option for manual Qt deployment Coordinated by Steve VK3VM 29-9-2024
+# Miinor output and documntation tweaks Coordinated by Steve VK3VM 29-9-2024
#
#-----------------------------------------------------------------------------#
@@ -47,10 +49,13 @@ function InstallQt($script) {
Write-Host "-----------------------------------------------------"
Write-Host " Qt Installation"
Write-Host "-----------------------------------------------------"
-
+ Write-Host ""
+ Write-Host "* Downloading latest Qt Installer"
+ Write-Host ""
Invoke-Expression -Command $PSScriptRoot\Download-QtInstaller.ps1
#Deal with Online Installer unable to be downloaded
+
$exe = "$PSScriptRoot\qt-unified-windows-x64-online.exe"
if (Test-Path $exe) {
Write-Host " --> Validated Installation `[$exe`]"
@@ -59,43 +64,35 @@ function InstallQt($script) {
InstallError($msg)
}
- Write-Host " --> Check if Qt already installed"
# Check to see that Qt is not already installed
- $exe = "$env:JTSDK_TOOLS"+"\Qt\MaintenanceTool.exe"
- if ((Test-Path $exe) -ne 0) { PreviousQtInstall }
+ Write-Host "* Check if Qt already installed"
- Write-Host ""
- Write-Host "-----------------------------------------------------"
- Write-Host " Installing Qt Using Generated QS Scripts"
- Write-Host "-----------------------------------------------------"
- Write-Host ""
- Write-Host " NOTE: Some installer buttons are disabled. To Cancel"
- Write-Host " or Stop the installation, kill the Qt Installer via"
- Write-Host " the Windows Task Manager."
- Write-Host ""
- Write-Host " USER ACTION: Once the Installer starts you will be "
- Write-Host " asked to enter Qt account details or to Create a Qt"
- Write-Host " account. After that you will be asked whether you want"
- Write-Host " to feed back quality information to Qt."
- Write-Host ""
- Write-Host "* Starting Qt Installation. "
- Write-Host ""
- Write-Host " --> Deploying via script `[$script`]"
+ #If Qt is already installed run the MaintenanceTool
+ $exe = "$env:JTSDK_TOOLS"+"\Qt\MaintenanceTool.exe"
+ if ( $script -ne "manual" ) { # As long as Manual is not selected !
+ if ((Test-Path $exe) -ne 0) { PreviousQtInstall }
+
+ Write-Host ""
+ Write-Host "* Starting Qt Installation. "
+ Write-Host ""
+ Write-Host " --> Note: Only manual Qt deployments now supported" -ForegroundColor Yellow
+ $cmd = "$QT_INSTPROG $QT_SOURCE"
+# $cmd = "$QT_INSTPROG --ao --script .\qt`-$script`-install.qs $QT_SOURCE" # Deprecated script installation support
+ } else {
+ $cmd = "$QT_INSTPROG $QT_SOURCE"
+ }
- # This version specifies the closest pool mirror as source
- #$cmd = "qt-unified-windows-x64-online.exe --script .\qt`-$script`-install.qs"
- # This version specifies the contents to $QT_SOURCE read from Versions.ini (if there is one) as source
- $cmd = "$QT_INSTPROG --ao --script .\qt`-$script`-install.qs $QT_SOURCE"
$exitCode = Invoke-Command -ScriptBlock { cmd /c $cmd *> $null; return $LASTEXITCODE }
# A proper exit returns 1 at the moment ... crazy !
IF ($LASTEXITCODE -eq 1) {
- Write-Host " --> Install Check Passed"
+ Write-Host " --> Install Check Passed" -ForegroundColor Yellow
} else {
$msg = "*** Install failed. Try gain.***"
InstallError($msg)
exit(-1)
}
- InstallSummary
+
+ InstallSummary # As manual now the preferred option this is no longer appropriate
}
function UpdateQt {
@@ -150,12 +147,8 @@ function PreviousQtInstall {
Write-Host " JTSDK Qt Setup Previous Install Found"
Write-Host "-----------------------------------------------------"
Write-Host ""
- Write-Host " The install script found MaintenanceTool.exe in the"
- Write-Host " target install directory. This prevents the use of"
- Write-Host " generated QS scripts to perform an installation."
- Write-Host ""
- Write-Host " Run `"MaintenanceTool.exe`" in the Qt deployment"
- Write-Host " directory to add, remove and`/or update components."
+ Write-Host "* Run `"MaintenanceTool.exe`" in the Qt deployment"
+ Write-Host " directory to add, remove and`/or update components."
Write-Host ""
exit(0)
@@ -169,32 +162,12 @@ function InstallHelp {
Write-Host " JTSDK Qt Installation Help"
Write-Host "-----------------------------------------------------"
Write-Host ""
- Write-Host " This script can install Qt using one of two deploys:"
- Write-Host ""
- Write-Host " 1. Minimial (qt-min-install.qs)"
- Write-Host ""
- Write-Host " Installs the following components:"
- Write-Host ""
- Write-Host " qt.tools.qtcreator"
- Write-Host " qt.tools.maintenance"
- Write-Host " qt.tools.cmake.win64"
- Write-Host " qt.qt5.5152.win64_mingw81"
- Write-Host " qt.tools.win64_mingw810"
- Write-Host " qt.tools.vcredist_msvc2017_x64"
- Write-Host " qt.tools.vcredist_msvc2019_x64"
- Write-Host ""
- Write-Host " 2. Full (qt-full-install.qs)"
- Write-Host ""
- Write-Host " Installs Minimal, plus additional versions:"
- Write-Host ""
- Write-Host " qt.qt6.651.win64_mingw (Full Deployment)"
- Write-Host " qt.tools.win64_mingw900"
- Write-Host ""
Write-Host " Usage:"
Write-Host ""
Write-Host " InstallQt.ps1 help .... Display this help message"
- Write-Host " InstallQt.ps1 min ..... Install minimal components"
- Write-Host " InstallQt.ps1 full .... Install all components"
+ Write-Host " InstallQt.ps1 manual .. Install minimal components"
+# Write-Host " InstallQt.ps1 min ..... Install minimal components" # Deprecated
+# Write-Host " InstallQt.ps1 full .... Install all components" # Deprecated
Write-Host " InstallQt.ps1 update .. Update components"
Write-Host " InstallQt.ps1 manage .. Manage installed components"
Write-Host ""
@@ -218,45 +191,12 @@ function InstallSummary {
Write-Host " JTSDK Qt Install Summary"
Write-Host "-----------------------------------------------------"
Write-Host ""
- Write-Host " JTSDK64 Tools Qt Install Complete. The following"
- Write-Host " components were installed:"
+ Write-Host "* JTSDK64 Tools: Qt Install Complete."
Write-Host ""
- if ($script -eq "min") {
- Write-Host " Install Type .... Minimal"
- Write-Host " Install Script .. $env:JTSDK_SETUP\qt\qt-$script`-install.qs"
- Write-Host " Location ........ $env:JTSDK_TOOLS\Qt"
- Write-Host ""
- Write-Host " Qt Components:"
- Write-Host ""
- Write-Host " qt.tools.qtcreator"
- Write-Host " qt.tools.maintenance"
- Write-Host " qt.tools.cmake.win64"
- Write-Host " qt.qt5.5152.win64_mingw81"
- Write-Host " qt.tools.win64_mingw810"
- Write-Host " qt.tools.vcredist_msvc2017_x64"
- Write-Host " qt.tools.vcredist_msvc2019_x64"
- }
- if ($script -eq "full") {
- Write-Host " Install `Type .... Full"
- Write-Host " Install Script .. $JTSDK_SETUP\qt\qt-$script`-install.qs"
- Write-Host " Location ........ $JTSDK_TOOLS\Qt"
- Write-Host ""
- Write-Host " Qt Components:"
- Write-Host ""
- Write-Host " qt.tools.qtcreator"
- Write-Host " qt.tools.maintenance"
- Write-Host " qt.tools.cmake.win64"
- Write-Host " qt.qt5.5152.win64_mingw81"
- Write-Host " qt.qt6.651.win64_mingw (full deployment)"
- Write-Host " qt.tools.win64_mingw810"
- Write-Host " qt.tools.win64_mingw900"
- Write-Host " qt.tools.vcredist_msvc2017_x64"
- Write-Host " qt.tools.vcredist_msvc2019_x64"
- }
- Write-Host ""
- Write-Host " To ensure the install worked properly, exit"
- Write-Host " the setup environment. Re-launch jtsdk64-setup "
- Write-Host " checking the status of each component"
+
+ Write-Host " --> To ensure the install worked properly, exit"
+ Write-Host " the setup environment. Re-launch jtsdk64-setup "
+ Write-Host " checking the status of each component"
Write-Host ""
exit(0)
@@ -272,21 +212,21 @@ $env:JTSDK_VC = "$env:JTSDK_CONFIG\Versions.ini"
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]) } }
$QT_INSTPROG = $configTable.Get_Item("qtinstprog")
$QT_SOURCE = $configTable.Get_Item("qtsource")
-Write-Host "Qt Installation program: $QT_INSTPROG "
+Write-Host "* Qt Installation program: $QT_INSTPROG "
If ($QT_SOURCE) {
- Write-Host "Qt Installation Mirror: $QT_SOURCE"
+ Write-Host "* Qt Installation Mirror: $QT_SOURCE"
$QT_SOURCE = " --mirror $QT_SOURCE"
} else {
- Write-Host "Qt is being pulled from a pooled repository."
+ Write-Host "^ Qt is being pulled from a pooled repository."
}
Write-Host ""
-# Read-Host -Prompt "Press any key to continue"
# Process input commands
for ( $i = 0; $i -lt $args.count; $i++ ) {
- if ($args[ $i ] -eq "min"){ InstallQt("min") }
- if ($args[ $i ] -eq "full"){ InstallQt("full") }
+# if ($args[ $i ] -eq "min"){ InstallQt("min") }
+# if ($args[ $i ] -eq "full"){ InstallQt("full") }
+ if ($args[ $i ] -eq "manual"){ InstallQt("manual") }
if ($args[ $i ] -eq "update"){ UpdateQt }
if ($args[ $i ] -eq "manage"){ ManageQt }
if ($args[ $i ] -eq "help"){ InstallHelp }
@@ -298,8 +238,9 @@ Write-Host "No command `switch or invalid switch entered."
Write-Host ""
Write-Host "Valid Switches`:"
Write-Host ""
-Write-Host " min - Scripted installation Qt MinGW 5.15.2 only"
-Write-Host " full - Scripted installation 5.15.2, 6.5.1"
+Write-Host " manual - Scripted installation Qt MinGW 5.15.2 only"
+#Write-Host " min - Scripted installation Qt MinGW 5.15.2 only"
+#Write-Host " full - Scripted installation 5.15.2, 6.5.1"
Write-Host " update - Update Qt Deployment"
Write-Host " manage - Manage Qt Deployment"
Write-Host " help - Get Installation Help"
diff --git a/tools/setup/qt/qt-full-install.qs b/tools/setup/qt/qt-full-install.qs
new file mode 100644
index 0000000..dd72c14
--- /dev/null
+++ b/tools/setup/qt/qt-full-install.qs
@@ -0,0 +1,122 @@
+function Controller() {
+ installer.autoRejectMessageBoxes();
+ installer.installationFinished.connect(function() {
+ gui.clickButton(buttons.NextButton);
+ })
+}
+
+Controller.prototype.WelcomePageCallback = function() {
+ gui.clickButton(buttons.NextButton, 3000);
+}
+
+Controller.prototype.CredentialsPageCallback = function(){
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.IntroductionPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.TargetDirectoryPageCallback = function() {
+ gui.currentPageWidget().TargetDirectoryLineEdit.setText("C:/JTSDK64-Tools/tools/Qt");
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function() {
+ var widget = gui.currentPageWidget();
+ widget.deselectAll();
+ widget.selectComponent("qt.license.thirdparty");
+ widget.selectComponent("qt.license.lgpl");
+ widget.selectComponent("qt.tools.vcredist_msvc2017_x64");
+ widget.selectComponent("qt.tools.vcredist_msvc2019_x64");
+ widget.selectComponent("qt.tools.maintenance")
+ widget.selectComponent("qt.tools.qtcreator");
+ widget.selectComponent("qt.tools.cmake");
+ widget.selectComponent("qt.tools.openssl");
+ widget.selectComponent("qt.tools.openssl.win_x64");
+ widget.selectComponent("qt.tools.win64_mingw810");
+ widget.selectComponent("qt.qt5.5152.win64_mingw81");
+ widget.selectComponent("qt.qt6.661");
+ widget.selectComponent("qt.qt6.661.win64_mingw");
+ widget.selectComponent("qt.qt6.661.qt5compat");
+ widget.selectComponent("qt.qt6.661.qt5compat.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons");
+ widget.selectComponent("qt.qt6.661.addons.qt3d");
+ widget.selectComponent("qt.qt6.661.addons.qt3d.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtactiveqt");
+ widget.selectComponent("qt.qt6.661.addons.qtactiveqt.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtactiveqt");
+ widget.selectComponent("qt.qt6.661.addons.qtactiveqt.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtcharts");
+ widget.selectComponent("qt.qt6.661.addons.qtcharts.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtconnectivity");
+ widget.selectComponent("qt.qt6.661.addons.qtconnectivity.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtdatavis3d");
+ widget.selectComponent("qt.qt6.661.addons.qtdatavis3d.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtimageformats");
+ widget.selectComponent("qt.qt6.661.addons.qtimageformats.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtlanguageserver");
+ widget.selectComponent("qt.qt6.661.addons.qtlanguageserver.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtlottie");
+ widget.selectComponent("qt.qt6.661.addons.qtlottie.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtmultimedia");
+ widget.selectComponent("qt.qt6.661.addons.qtmultimedia.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtnetworkauth");
+ widget.selectComponent("qt.qt6.661.addons.qtnetworkauth.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtpdf");
+ widget.selectComponent("qt.qt6.661.addons.qtpdf.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtpositioning");
+ widget.selectComponent("qt.qt6.661.addons.qtpositioning.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtremoteobjects");
+ widget.selectComponent("qt.qt6.661.addons.qtremoteobjects.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtscxml");
+ widget.selectComponent("qt.qt6.661.addons.qtscxml.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtsensors");
+ widget.selectComponent("qt.qt6.661.addons.qtsensors.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtserialbus");
+ widget.selectComponent("qt.qt6.661.addons.qtserialbus.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtserialport");
+ widget.selectComponent("qt.qt6.661.addons.qtserialport.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtvirtualkeyboard");
+ widget.selectComponent("qt.qt6.661.addons.qtvirtualkeyboard.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtwebchannel");
+ widget.selectComponent("qt.qt6.661.addons.qtwebchannel.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtwebengine");
+ widget.selectComponent("qt.qt6.661.addons.qtwebengine.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtwebsockets");
+ widget.selectComponent("qt.qt6.661.addons.qtwebsockets.win64_mingw");
+ widget.selectComponent("qt.qt6.661.addons.qtwebview");
+ widget.selectComponent("qt.qt6.661.addons.qtwebview.win64_mingw");
+ widget.selectComponent("qt.qt6.661.debug_info");
+ widget.selectComponent("qt.qt6.661.debug_info.win64_mingw");
+ widget.selectComponent("qt.qt6.661.qtquick3d");
+ widget.selectComponent("qt.qt6.661.qtquick3d.win64_mingw");
+ widget.selectComponent("qt.qt6.661.qtquicktimeline");
+ widget.selectComponent("qt.qt6.661.qtquicktimeline.win64_mingw");
+ widget.selectComponent("qt.qt6.661.qtshadertools");
+ widget.selectComponent("qt.qt6.661.qtshadertools.win64_mingw");
+ widget.selectComponent("qt.tools.windows_kits_debuggers");
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.LicenseAgreementPageCallback = function() {
+ gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.StartMenuDirectoryPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ReadyForInstallationPageCallback = function()
+{
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.FinishedPageCallback = function() {
+ var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
+ if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
+ checkBoxForm.launchQtCreatorCheckBox.checked = false;
+ }
+ gui.clickButton(buttons.FinishButton);
+}
diff --git a/tools/setup/qt/qt-min-install.qs b/tools/setup/qt/qt-min-install.qs
new file mode 100644
index 0000000..c66f2f7
--- /dev/null
+++ b/tools/setup/qt/qt-min-install.qs
@@ -0,0 +1,61 @@
+function Controller() {
+ installer.autoRejectMessageBoxes();
+ installer.installationFinished.connect(function() {
+ gui.clickButton(buttons.NextButton);
+ })
+}
+
+Controller.prototype.WelcomePageCallback = function() {
+ gui.clickButton(buttons.NextButton, 3000);
+}
+
+Controller.prototype.CredentialsPageCallback = function(){
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.IntroductionPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.TargetDirectoryPageCallback = function() {
+ gui.currentPageWidget().TargetDirectoryLineEdit.setText("C:/JTSDK64-Tools/tools/Qt");
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ComponentSelectionPageCallback = function() {
+ var widget = gui.currentPageWidget();
+ widget.deselectAll();
+ widget.selectComponent("qt.license.thirdparty");
+ widget.selectComponent("qt.license.lgpl");
+ widget.selectComponent("qt.tools.vcredist_msvc2017_x64");
+ widget.selectComponent("qt.tools.vcredist_msvc2019_x64");
+ widget.selectComponent("qt.tools.maintenance")
+ widget.selectComponent("qt.tools.qtcreator");
+ widget.selectComponent("qt.tools.cmake");
+ widget.selectComponent("qt.tools.openssl.win_x64");
+ widget.selectComponent("qt.tools.win64_mingw810");
+ widget.selectComponent("qt.qt5.5152.win64_mingw81");
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.LicenseAgreementPageCallback = function() {
+ gui.currentPageWidget().AcceptLicenseRadioButton.setChecked(true);
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.StartMenuDirectoryPageCallback = function() {
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.ReadyForInstallationPageCallback = function()
+{
+ gui.clickButton(buttons.NextButton);
+}
+
+Controller.prototype.FinishedPageCallback = function() {
+ var checkBoxForm = gui.currentPageWidget().LaunchQtCreatorCheckBoxForm
+ if (checkBoxForm && checkBoxForm.launchQtCreatorCheckBox) {
+ checkBoxForm.launchQtCreatorCheckBox.checked = false;
+ }
+ gui.clickButton(buttons.FinishButton);
+}