Merge pull request #2498 from hoffie/aqt-reduce-downloads

Autobuild: Reduce Qt download size & bump aqtinstall to 2.0.6
jamulussoftware · Mar 13, 2022 · 880b6ff · 880b6ff
2 parents 51bdeaf + c716b3f
commit 880b6ff
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/autobuild/ios/autobuild_ios_1_prepare.sh b/autobuild/ios/autobuild_ios_1_prepare.sh
@@ -9,15 +9,15 @@ fi
 
 QT_DIR=/usr/local/opt/qt
 QT_VER=$1
-AQTINSTALL_VERSION=2.0.5
+AQTINSTALL_VERSION=2.0.6
 
 ###################
 ###  PROCEDURE  ###
 ###################
 
 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
@@ -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  ###
@@ -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
@@ -21,15 +21,22 @@ 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 ( !$? )
     {
         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"
         }
     }
 }
@@ -42,7 +49,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"
@@ -63,10 +70,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