lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
dd4278ddc1489c05e9bb1156090f45596fcf45da
qt5/coin/provisioning/common/windows
History
Nils Petter Skålerud 18a08f7eb6 FFmpeg, Android ARMv7: Use correct build folder when fixing deps 
This patch amends 133de012af95507ac485845d8de8f58da005df64.

The previous patch introduced a regression where the newer build paths
were not being passed correctly into 'fix_ffmpeg_dependencies.sh'
during FFmpeg Android builds.

This patch introduces a common function to resolve the installation
directory, which is then used both during compilation and during
FFmpeg patching.

Additionally, it introduces some basic error-handling when running
'fix_ffmpeg_dependencies.sh' so that we can catch this issue in
integration, in the future.

Fixes: QTBUG-138615
Change-Id: I195ebd3034a3184bad32e75916a41a20838b2db1
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 7f416abf32)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2025-09-05 05:26:40 +00:00
..
conan_manifests
Provisioning: Update Conan packages
2020-09-16 08:58:33 +03:00
vcpkg
Provisioning: Install OpenSSL via Vcpkg on Windows
2023-12-18 06:32:27 +01:00
3dstudio_3rdparty.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
allow-remote-desktop-access.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
android-openssl.ps1
Android: set nightly targets for older NDK versions
2025-06-24 10:36:45 +00:00
android.ps1
Android: set nightly targets for older NDK versions
2025-06-24 10:36:45 +00:00
certificate-updates.ps1
Provisioning: Add Root Certificate update for Windows
2025-03-31 07:21:38 +02:00
change-language-settings.ps1
Provisioning: Change locale and language settings
2021-10-29 06:51:55 +00:00
cmake.ps1
CMake: Update provisioned CMake to version 3.30.5
2024-10-27 10:13:54 +02:00
conan.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-autoreboot.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-clean-manager.ps1
Provisioning: Disable automatic cleanup from windows
2019-10-18 13:53:05 +03:00
disable-defragment.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-ntp.ps1
…
disable-quickedit.ps1
Provisioning: Disable powershell quickedit
2018-10-13 08:41:42 +00:00
disable-sleep.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-uac.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-windefender.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
disable-windows-delivery-optimization.ps1
Provisioning: Disable Windows Delivery Optimization service
2025-05-15 12:39:22 +00:00
disable-windows-mdns.ps1
Provisioning: Disable Windows multicast device discoveries
2025-06-24 11:49:51 +00:00
disable-windows-module-installer.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
disable-windows-updates.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
dxsdk.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
emsdk.ps1
wasm: set cache files for Emscripten 4.0.7
2025-07-02 05:23:33 +00:00
exceutequeueditems.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
fbx_windows.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
grpc.ps1
Add provisioning of gRPC on Windows machines
2023-11-22 20:06:49 +02:00
helpers.ps1
Prevent Enter-VsDevShell from changing current working directory
2025-07-26 00:01:03 +00:00
install_telegraf.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
install-azure-tool.ps1
Update azure sign tool to 5.0.0
2024-06-28 15:12:43 +03:00
install-breakpad.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-dependencywalker.ps1
Provisioning: Install dependency-walker on windows arm64
2024-06-05 10:13:05 +00:00
install-dotnet.ps1
Update and install dotnet on windows on arm
2024-06-28 15:12:32 +03:00
install-ffmpeg.ps1
FFmpeg, Android ARMv7: Use correct build folder when fixing deps
2025-09-05 05:26:40 +00:00
install-firebird.ps1
Coin: adjust local repo paths
2024-10-05 11:18:58 +02:00
install-git.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-gnuwin32.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-golang.ps1
Fix and define cache links for golang and upx
2024-09-18 15:49:55 +03:00
install-jdk.ps1
Provisioning: Add Java 17 to Windows on ARM
2024-07-24 10:45:24 +03:00
install-mcuxpresso.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-mingw.ps1
Update MinGW to v13.1.0 (x86_64)
2023-12-11 13:14:06 +02:00
install-mosquitto.ps1
wasm: Enable the mosquitto test broker on Ubuntu and windows
2025-01-26 19:05:29 +01:00
install-msys2.ps1
Upgrade to msys2 20240113 in Windows provisioning
2024-02-23 15:08:19 +01:00
install-network-test.ps1
Add windows provisioning script for CI network test
2025-05-14 21:18:05 +02:00
install-notepad++.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
install-openssh.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
install-oracle.ps1
Coin: Fix env var for Oracle libraries and headers
2024-12-10 16:30:43 +02:00
install-ruby.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-sccache.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-sed.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-sevenzip.ps1
Update Windows provisioning to use 7z version 24.09
2025-02-07 13:13:17 +00:00
install-stm32cubeprogrammer.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-strawberry-perl.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
install-upx.ps1
Fix and define cache links for golang and upx
2024-09-18 15:49:55 +03:00
install-vcpkg-ports-android.ps1
Relax jq dependency from provisioning
2025-05-15 06:19:40 +02:00
install-vcpkg-ports.ps1
Relax jq dependency from provisioning
2025-05-15 06:19:40 +02:00
install-vcpkg.ps1
Set-EnvironmentVariable helper: apply envvar to current PS session
2025-06-24 10:36:41 +00:00
jom.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
libclang-v100-dyn.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
libclang.ps1
Provisioning: Add arm64 libclang for Windows 11 24H2
2025-08-09 00:35:13 +00:00
libusb.ps1
Update libusb to 1.0.26 on Windows
2023-10-03 20:43:58 +03:00
longpath.ps1
Set longpathsenabled reg key on windows
2023-11-07 17:01:12 +00:00
memorypershell.ps1
…
mesa_llvmpipe.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
mimersql.ps1
Only install necessary Mimer SQL components
2024-06-11 17:17:34 +02:00
mount-vcpkg-cache-drive.ps1
Provisioning: Mount Vcpkg Cache Drive on Windows
2023-11-05 10:05:51 +01:00
mqtt_broker.ps1
Provisioning: Update MQTT broker
2024-06-21 20:56:15 +03:00
msvc-2013-update5.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
msys.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
mysql.ps1
Update MySQL and enable it for more Windows targets
2024-04-21 18:21:32 +03:00
ninja.ps1
Add Windows 11 24h2 x86_64 UEFI with non-blocking tests
2025-04-11 08:43:08 +00:00
nodejs.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
opcua_unifiedautomation.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
openssl-arm64.ps1
Provisioning: Add Windows 11 on ARM as non-blocking in CI
2024-05-14 19:47:28 +03:00
openssl.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
postgresql.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
protobuf.ps1
Update MinGW to v13.1.0 (x86_64)
2023-12-11 13:14:06 +02:00
python3.ps1
Add an overall requirements.txt file
2025-05-07 17:41:30 +02:00
qnx710.ps1
Update QNX7.1 toolchain for CI
2024-05-19 07:47:25 +00:00
set-network-test-server.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
set-proxy.ps1
Windows: Enable proxy with fix to cert issue with Py 3.10+
2024-08-16 15:05:23 +03:00
share-test-folders.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
squish-coco.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
squishInstall.ps1
Provisioning: update Squish 8.1
2024-12-30 08:05:28 +02:00
telegraf_password.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
telegraf-coin.conf
Install telegraf on all provisioned VMs
2019-09-27 08:42:31 +02:00
unset-proxy.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
update-msvc2019.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
vc_redist.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
vclibs_debug.ps1
…
version.ps1
Provisioning: Make Windows Path visible at the end of provisioning
2024-12-11 09:09:50 +03:00
vulkansdk.ps1
Provisioning: Add missing Vulkan library to Windows on ARM
2024-12-11 12:12:33 +02:00
win10-enable-devmode.ps1
…
win10sdk.ps1
Use SPDX license identifiers
2023-06-12 12:10:41 +00:00
winappsdk.ps1
Install WebView2 on other windows nodes
2025-07-03 13:24:55 +02:00
winrtrunner.ps1
Correct the domain of ci-files01-hki
2023-06-12 12:10:26 +00:00
wsearch-off.ps1
…
zlib-helpers.ps1
Build zlib while provisioning on Windows
2025-07-26 00:01:13 +00:00
zlib.ps1
Build zlib while provisioning on Windows
2025-07-26 00:01:13 +00:00