From 89cd4248f7c85b9a063dc504c60792b90d43f5b5 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 13 Mar 2022 00:11:36 +0100 Subject: [PATCH 1/4] Autobuild: Bump aqtinstall to 2.0.6 --- autobuild/ios/autobuild_ios_1_prepare.sh | 2 +- autobuild/mac/autobuild_mac_1_prepare.sh | 2 +- autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild/ios/autobuild_ios_1_prepare.sh b/autobuild/ios/autobuild_ios_1_prepare.sh index 3a92c7c1b5..8df1a47bd2 100755 --- a/autobuild/ios/autobuild_ios_1_prepare.sh +++ b/autobuild/ios/autobuild_ios_1_prepare.sh @@ -9,7 +9,7 @@ fi QT_DIR=/usr/local/opt/qt QT_VER=$1 -AQTINSTALL_VERSION=2.0.5 +AQTINSTALL_VERSION=2.0.6 ################### ### PROCEDURE ### diff --git a/autobuild/mac/autobuild_mac_1_prepare.sh b/autobuild/mac/autobuild_mac_1_prepare.sh index c71d9a4589..2e7f118c6c 100755 --- a/autobuild/mac/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/autobuild_mac_1_prepare.sh @@ -9,7 +9,7 @@ fi QT_DIR=/usr/local/opt/qt QT_VER=$1 -AQTINSTALL_VERSION=2.0.5 +AQTINSTALL_VERSION=2.0.6 ################### ### PROCEDURE ### diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 index 51c9284faf..cefc3ad54f 100644 --- a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 @@ -42,7 +42,7 @@ $QtDir = 'C:\Qt' $ChocoCacheDir = 'C:\ChocoCache' $Qt32Version = "5.15.2" $Qt64Version = "5.15.2" -$AqtinstallVersion = "2.0.5" +$AqtinstallVersion = "2.0.6" $JackVersion = "1.9.17" $Msvc32Version = "win32_msvc2019" $Msvc64Version = "win64_msvc2019_64" From c6f3ed20ccf82172286e0007689e453227a4b1aa Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 13 Mar 2022 00:13:08 +0100 Subject: [PATCH 2/4] Autobuild: Add proper quoting around aqt invocations --- autobuild/ios/autobuild_ios_1_prepare.sh | 2 +- autobuild/mac/autobuild_mac_1_prepare.sh | 2 +- autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autobuild/ios/autobuild_ios_1_prepare.sh b/autobuild/ios/autobuild_ios_1_prepare.sh index 8df1a47bd2..3613d35e0c 100755 --- a/autobuild/ios/autobuild_ios_1_prepare.sh +++ b/autobuild/ios/autobuild_ios_1_prepare.sh @@ -17,7 +17,7 @@ AQTINSTALL_VERSION=2.0.6 echo "Install dependencies..." python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" -python3 -m aqt install-qt --outputdir "${QT_DIR}" mac ios ${QT_VER} +python3 -m aqt install-qt --outputdir "${QT_DIR}" mac ios "${QT_VER}" # Add the qt binaries to the PATH. # The clang_64 entry can be dropped when Qt <6.2 compatibility is no longer needed. diff --git a/autobuild/mac/autobuild_mac_1_prepare.sh b/autobuild/mac/autobuild_mac_1_prepare.sh index 2e7f118c6c..d10cc651a4 100755 --- a/autobuild/mac/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/autobuild_mac_1_prepare.sh @@ -20,7 +20,7 @@ if [[ -d "${QT_DIR}" ]]; then else echo "Install dependencies..." python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" - python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop ${QT_VER} + python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VER}" fi # Add the qt binaries to the PATH. diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 index cefc3ad54f..45f106e70b 100644 --- a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 @@ -63,10 +63,10 @@ else } echo "Get Qt 64 bit..." - Install-Qt ${Qt64Version} ${Msvc64Version} ${QtDir} + Install-Qt "${Qt64Version}" "${Msvc64Version}" "${QtDir}" echo "Get Qt 32 bit..." - Install-Qt ${Qt32Version} ${Msvc32Version} ${QtDir} + Install-Qt "${Qt32Version}" "${Msvc32Version}" "${QtDir}" } choco config set cacheLocation $ChocoCacheDir From a825f177eb198411c91c0d643f7249bf32e6a8ae Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 13 Mar 2022 00:22:21 +0100 Subject: [PATCH 3/4] Autobuild: Download required Qt archives only --- autobuild/ios/autobuild_ios_1_prepare.sh | 2 +- autobuild/mac/autobuild_mac_1_prepare.sh | 2 +- autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/autobuild/ios/autobuild_ios_1_prepare.sh b/autobuild/ios/autobuild_ios_1_prepare.sh index 3613d35e0c..ddd07e33db 100755 --- a/autobuild/ios/autobuild_ios_1_prepare.sh +++ b/autobuild/ios/autobuild_ios_1_prepare.sh @@ -17,7 +17,7 @@ AQTINSTALL_VERSION=2.0.6 echo "Install dependencies..." python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" -python3 -m aqt install-qt --outputdir "${QT_DIR}" mac ios "${QT_VER}" +python3 -m aqt install-qt --outputdir "${QT_DIR}" mac ios "${QT_VER}" --archives qtbase qttools qttranslations qtmacextras # Add the qt binaries to the PATH. # The clang_64 entry can be dropped when Qt <6.2 compatibility is no longer needed. diff --git a/autobuild/mac/autobuild_mac_1_prepare.sh b/autobuild/mac/autobuild_mac_1_prepare.sh index d10cc651a4..8e18460b2b 100755 --- a/autobuild/mac/autobuild_mac_1_prepare.sh +++ b/autobuild/mac/autobuild_mac_1_prepare.sh @@ -20,7 +20,7 @@ if [[ -d "${QT_DIR}" ]]; then else echo "Install dependencies..." python3 -m pip install "aqtinstall==${AQTINSTALL_VERSION}" - python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VER}" + python3 -m aqt install-qt --outputdir "${QT_DIR}" mac desktop "${QT_VER}" --archives qtbase qttools qttranslations qtmacextras fi # Add the qt binaries to the PATH. diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 index 45f106e70b..d0644441e1 100644 --- a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 @@ -21,7 +21,7 @@ Function Install-Qt { [string] $QtArch, [string] $InstallDir ) - $Args = ("--outputdir", "$InstallDir", "windows", "desktop", "$QtVersion", "$QtArch") + $Args = ("--outputdir", "$InstallDir", "windows", "desktop", "$QtVersion", "$QtArch", "--archives", "qtbase", "qttools", "qttranslations", "qtwinextras") aqt install-qt @Args if ( !$? ) { From c716b3fc53bd52bd4fdaa2a8471e327bab5d98c7 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Sun, 13 Mar 2022 00:25:58 +0100 Subject: [PATCH 4/4] Autobuild: Reformat aqt install-qt invocation on Windows --- .../autobuild_windowsinstaller_1_prepare.ps1 | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 index d0644441e1..95a81cd644 100644 --- a/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 +++ b/autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1 @@ -21,15 +21,22 @@ Function Install-Qt { [string] $QtArch, [string] $InstallDir ) - $Args = ("--outputdir", "$InstallDir", "windows", "desktop", "$QtVersion", "$QtArch", "--archives", "qtbase", "qttools", "qttranslations", "qtwinextras") + $Args = ( + "--outputdir", "$InstallDir", + "windows", + "desktop", + "$QtVersion", + "$QtArch", + "--archives", "qtbase", "qttools", "qttranslations", "qtwinextras" + ) aqt install-qt @Args if ( !$? ) { echo "WARNING: Qt installation via first aqt run failed, re-starting with different base URL." - aqt install-qt @Args -b https://mirrors.ocf.berkeley.edu/qt/ + aqt install-qt -b https://mirrors.ocf.berkeley.edu/qt/ @Args if ( !$? ) { - throw "Qt installation with args @Arguments failed with exit code $LastExitCode" + throw "Qt installation with args @{Args} failed with exit code $LastExitCode" } } }