Skip to content

Autobuild: Reduce Qt download size & bump aqtinstall to 2.0.6 #2498

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hoffie merged 4 commits into from
Mar 13, 2022
+17 −10
Merged

Autobuild: Reduce Qt download size & bump aqtinstall to 2.0.6 #2498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89cd424
Autobuild: Bump aqtinstall to 2.0.6
hoffie Mar 12, 2022
c6f3ed2
Autobuild: Add proper quoting around aqt invocations
hoffie Mar 12, 2022
a825f17
Autobuild: Download required Qt archives only
hoffie Mar 12, 2022
c716b3f
Autobuild: Reformat aqt install-qt invocation on Windows
hoffie Mar 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autobuild/ios/autobuild_ios_1_prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions autobuild/mac/autobuild_mac_1_prepare.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ###
Expand All @@ -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.
Expand Down
19 changes: 13 additions & 6 deletions autobuild/windows/autobuild_windowsinstaller_1_prepare.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand All @@ -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"
Expand All @@ -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
Expand Down