COIN: Fix cdbextension build

After the multi-arch changes

Change-Id: I7e067f707c098f43fb2ab71221c3e11ab4877b8b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2024-09-05 13:21:41 +02:00
parent 7661bba75c
commit 59520c6b3d

View File

@@ -156,19 +156,67 @@ instructions:
- type: ExecuteCommand - type: ExecuteCommand
command: >- command: >-
curl --fail -L --retry 5 --retry-delay 5 curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\Python38-win-x64.7z -o {{.AgentWorkingDir}}\build\qt_temp\Python311-win-x64.7z
https://master.qt.io/development_releases/prebuilt/python/Python38-win-x64.7z https://master.qt.io/development_releases/prebuilt/python/Python311-win-x64.7z
maxTimeInSeconds: 3600 maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360 maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download python package, check logs." userMessageOnFailure: "Failed to download python package, check logs."
- type: ExecuteCommand - type: ExecuteCommand
command: >- command: >-
7z.exe x -y 7z.exe x -y
{{.AgentWorkingDir}}\build\qt_temp\Python38-win-x64.7z {{.AgentWorkingDir}}\build\qt_temp\Python311-win-x64.7z
-o{{.AgentWorkingDir}}\build\qt_temp\python -o{{.AgentWorkingDir}}\build\qt_temp\python
maxTimeInSeconds: 3600 maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360 maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to extract python package, check logs." userMessageOnFailure: "Failed to extract python package, check logs."
- type: ExecuteCommand
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-amd64.zip
https://master.qt.io/development_releases/prebuilt/python/python-3.11.9-embed-amd64.zip
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download python package, check logs."
- type: ExecuteCommand
command: >-
7z.exe x -y
{{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-amd64.zip
-o{{.AgentWorkingDir}}\build\qt_temp\python-amd64
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to extract python package, check logs."
- type: ExecuteCommand
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-arm64.zip
https://master.qt.io/development_releases/prebuilt/python/python-3.11.9-embed-arm64.zip
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download python package, check logs."
- type: ExecuteCommand
command: >-
7z.exe x -y
{{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-arm64.zip
-o{{.AgentWorkingDir}}\build\qt_temp\python-arm64
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to extract python package, check logs."
- type: ExecuteCommand
command: >-
curl --fail -L --retry 5 --retry-delay 5
-o {{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-win32.zip
https://master.qt.io/development_releases/prebuilt/python/python-3.11.9-embed-win32.zip
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to download python package, check logs."
- type: ExecuteCommand
command: >-
7z.exe x -y
{{.AgentWorkingDir}}\build\qt_temp\python-3.11.9-embed-win32.zip
-o{{.AgentWorkingDir}}\build\qt_temp\python-win32
maxTimeInSeconds: 3600
maxTimeBetweenOutput: 360
userMessageOnFailure: "Failed to extract python package, check logs."
- type: ExecuteCommand - type: ExecuteCommand
command: >- command: >-
curl --fail -L --retry 5 --retry-delay 5 curl --fail -L --retry 5 --retry-delay 5
@@ -193,10 +241,13 @@ instructions:
--build {{.AgentWorkingDir}}\qt-creator\qt-creator_build --build {{.AgentWorkingDir}}\qt-creator\qt-creator_build
--qt-path {{.AgentWorkingDir}}/build/qt_install_dir --qt-path {{.AgentWorkingDir}}/build/qt_install_dir
--python-path {{.AgentWorkingDir}}\build\qt_temp\python --python-path {{.AgentWorkingDir}}\build\qt_temp\python
--add-config=-DPythonTargetx64Dll={{.AgentWorkingDir}}\build\qt_temp\python-amd64\python311.dll
--add-config=-DPythonTargetarm64Dll={{.AgentWorkingDir}}\build\qt_temp\python-arm64\python311.dll
--add-config=-DPythonTargetwin32Dll={{.AgentWorkingDir}}\build\qt_temp\python-win32\python311.dll
--elfutils-path {{.AgentWorkingDir}}/buid/qt_temp/elfutils --elfutils-path {{.AgentWorkingDir}}/buid/qt_temp/elfutils
--llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang --llvm-path {{.AgentWorkingDir}}/build/qt_temp/libclang
{{.Env.QTC_TEST_OPTION}}
--no-zip --no-zip
{{.Env.QTC_TEST_OPTION}}
{{.Env.QTC_SCCACHE_C_OPTION}} {{.Env.QTC_SCCACHE_C_OPTION}}
{{.Env.QTC_SCCACHE_CXX_OPTION}} {{.Env.QTC_SCCACHE_CXX_OPTION}}
{{.Env.QTC_SCCACHE_ENABLE_OPTION}} {{.Env.QTC_SCCACHE_ENABLE_OPTION}}