Skip to content

Commit 4f23f04

Browse files
committed
Try disabling checkouts when building Qt for Windows
1 parent 3819926 commit 4f23f04

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

taskcluster/kinds/toolchain/qt.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@ qt-windows-x86_64-6.6:
5252
extract: true
5353
run:
5454
script: compile_qt_6.ps1
55-
resources:
56-
- taskcluster/scripts/toolchain/configure_qt.ps1
55+
checkout: false
5756
toolchain-alias: qt-windows-x86_64-6.6
5857
toolchain-artifact: public/build/qt6_win.tar.xz
5958
treeherder:
@@ -73,8 +72,7 @@ qt-windows-x86_64-next:
7372
vs2022: toolchain-vs-2022-x86_64
7473
run:
7574
script: compile_qt_6.ps1
76-
resources:
77-
- taskcluster/scripts/toolchain/configure_qt.ps1
75+
checkout: false
7876
toolchain-alias: qt-windows-x86_64-next
7977
toolchain-artifact: public/build/qt6_win.tar.xz
8078
treeherder:
@@ -94,8 +92,7 @@ qt-windows-aarch64-next:
9492
vs2022: toolchain-vs-2022-aarch64
9593
run:
9694
script: compile_qt_6.ps1
97-
resources:
98-
- taskcluster/scripts/toolchain/configure_qt.ps1
95+
checkout: false
9996
toolchain-alias: qt-windows-aarch64-next
10097
toolchain-artifact: public/build/qt6_win.tar.xz
10198
treeherder:

taskcluster/scripts/build/windows_clang_cl.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ $QTPATH =resolve-path "$FETCHES_PATH/qt-windows/"
1010
# Prep Env:
1111
# Switch to the work dir, configure qt
1212
Set-Location -Path $TASK_WORKDIR
13-
. "$FETCHES_PATH/qt-windows/configure_qt.ps1"
13+
#. "$FETCHES_PATH/qt-windows/configure_qt.ps1"
1414

1515

1616
# Ensure we are working from a full checkout of all submodules. Taskcluster

taskcluster/scripts/source-test/clang-tidy.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $QTPATH =resolve-path "$FETCHES_PATH/qt-windows/"
1313
# Prep Env:
1414
# Switch to the work dir, configure qt
1515
Set-Location -Path $TASK_WORKDIR
16-
. "$FETCHES_PATH/qt-windows/configure_qt.ps1"
16+
#. "$FETCHES_PATH/qt-windows/configure_qt.ps1"
1717

1818
## Setup the conda environment
1919
. $SOURCE_DIR/scripts/utils/call_bat.ps1 $FETCHES_PATH/Scripts/activate.bat

taskcluster/scripts/toolchain/compile_qt_6.ps1

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ if(!(Test-Path $QT_INSTALL_PATH)){
6363
if(!(Test-Path $QT_BUILD_PATH)){
6464
New-Item -Path qt-build -ItemType "directory"
6565
}
66-
Copy-Item -Path "$env:VCS_PATH/taskcluster/scripts/toolchain/configure_qt.ps1" -Destination qt-windows/
6766

6867
# Setup Openssl Import
6968
unzip -o -qq -d "$env:TASK_WORKDIR/qt-windows" "$env:MOZ_FETCHES_DIR/open_ssl_win.zip" # See toolchain/qt.yml for why
@@ -131,6 +130,14 @@ if ($LastExitCode -ne 0) {
131130
Exit $LastExitCode
132131
}
133132

133+
Write-Output "Installing bin/qt.conf"
134+
$QT_CONFIG_FILE = @"
135+
[Paths]
136+
Prefix=../
137+
Libraries=../lib
138+
"@
139+
Write-Output $QT_CONFIG_FILE | Out-File -Encoding Utf8 -FilePath $QT_INSTALL_PATH/bin/qt.conf
140+
134141
Write-Output "Compressing tarball"
135142
New-Item -ItemType Directory -Path "$env:TASK_WORKDIR/public/build" -Force
136143
tar -cvJf public/build/qt6_win.tar.xz qt-windows/

0 commit comments

Comments
 (0)