mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-10 08:56:40 +08:00
Compare commits
20 Commits
c5a42f267f
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4466bd8555 | ||
|
|
8fd9b78872 | ||
|
|
5476a35d44 | ||
|
|
2b4ab5519b | ||
|
|
2450189a4f | ||
|
|
a1289ed5d5 | ||
|
|
bee5ded33b | ||
|
|
dc592b73d6 | ||
|
|
9a13282256 | ||
|
|
5579337dde | ||
|
|
4456a7f592 | ||
|
|
da911f9b20 | ||
|
|
406dca5bf3 | ||
|
|
9c05c68c86 | ||
|
|
8fb136fc8a | ||
|
|
f032c3156d | ||
|
|
e98fab4c4e | ||
|
|
e6c1ad7c0b | ||
|
|
dd0dae532f | ||
|
|
a98c97ed95 |
@@ -182,7 +182,6 @@ Configurations:
|
||||
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
|
||||
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022'
|
||||
@@ -198,7 +197,6 @@ Configurations:
|
||||
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
|
||||
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23h2-arm64-msvc2022'
|
||||
@@ -213,7 +211,6 @@ Configurations:
|
||||
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
'WEBVIEW2_SDK_ROOT={{.Env.WEBVIEW2_SDK_ROOT_PATH}}',
|
||||
'ZLIB_ROOT={{.Env.ZLIB_PATH_ARM64}}',
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-arm64'
|
||||
@@ -256,7 +253,6 @@ Configurations:
|
||||
'VCPKG_HOST_TRIPLET=x64-windows-qt',
|
||||
'VCPKG_TARGET_TRIPLET=x64-windows-qt',
|
||||
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
|
||||
'ZLIB_ROOT={{.Env.ZLIB_PATH_AMD64}}',
|
||||
]
|
||||
-
|
||||
Id: 'rhel-9.6'
|
||||
|
||||
@@ -17,6 +17,8 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF',
|
||||
'VCPKG_HOST_TRIPLET=universal-osx-qt',
|
||||
'VCPKG_TARGET_TRIPLET=universal-osx-qt',
|
||||
]
|
||||
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
@@ -91,6 +93,8 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'VCPKG_HOST_TRIPLET=universal-osx-qt',
|
||||
'VCPKG_TARGET_TRIPLET=universal-osx-qt',
|
||||
]
|
||||
-
|
||||
Id: 'macos-26-x86_64-developer-build'
|
||||
@@ -111,6 +115,8 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'VCPKG_HOST_TRIPLET=universal-osx-qt',
|
||||
'VCPKG_TARGET_TRIPLET=universal-osx-qt',
|
||||
]
|
||||
-
|
||||
Id: 'macos-26-arm64-developer-build'
|
||||
@@ -121,6 +127,8 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'VCPKG_HOST_TRIPLET=arm64-osx-qt',
|
||||
'VCPKG_TARGET_TRIPLET=arm64-osx-qt',
|
||||
]
|
||||
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
Version: 2
|
||||
Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Id: 'ubuntu-22.04-baseline-tests'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'UseConfigure']
|
||||
Configure arguments: '-developer-build -nomake examples'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'CTEST_DIR=tests/baseline',
|
||||
'QT_LANCELOT_SERVER=10.9.70.11'
|
||||
]
|
||||
|
||||
@@ -15,8 +15,3 @@ Include: [
|
||||
quick-bridges.yaml
|
||||
]
|
||||
Configurations: []
|
||||
Overrides:
|
||||
# Make VxWorks tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
13
coin/platform_configs/qtbridge-csharp.yaml
Normal file
13
coin/platform_configs/qtbridge-csharp.yaml
Normal file
@@ -0,0 +1,13 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
quick-bridges.yaml: [
|
||||
"windows-quick-bridges"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-csharp'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesCsharp']
|
||||
31
coin/platform_configs/qtbridge-java.yaml
Normal file
31
coin/platform_configs/qtbridge-java.yaml
Normal file
@@ -0,0 +1,31 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
quick-bridges.yaml: [
|
||||
"macos-quick-bridges",
|
||||
"linux-quick-bridges",
|
||||
"windows-quick-bridges"
|
||||
]
|
||||
]
|
||||
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-java'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
|
||||
|
||||
-
|
||||
Id: 'linux-quick-bridges-java'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'linux-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesJava']
|
||||
|
||||
-
|
||||
Id: 'macos-quick-bridges-java'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
|
||||
|
||||
31
coin/platform_configs/qtbridge-python.yaml
Normal file
31
coin/platform_configs/qtbridge-python.yaml
Normal file
@@ -0,0 +1,31 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
quick-bridges.yaml: [
|
||||
"macos-quick-bridges",
|
||||
"windows-quick-bridges"
|
||||
],
|
||||
cmake_platforms.yaml: [
|
||||
"rhel-9.6"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-python'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
|
||||
|
||||
-
|
||||
Id: 'linux-quick-bridges-python'
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'rhel-9.6'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
|
||||
|
||||
-
|
||||
Id: 'macos-quick-bridges-python'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
|
||||
21
coin/platform_configs/qtbridge-rust.yaml
Normal file
21
coin/platform_configs/qtbridge-rust.yaml
Normal file
@@ -0,0 +1,21 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
quick-bridges.yaml: [
|
||||
"linux-quick-bridges",
|
||||
"windows-quick-bridges"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-rust'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
|
||||
|
||||
-
|
||||
Id: 'linux-quick-bridges-rust'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'linux-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'RunAsPlatformDependency', 'QtBridgesRust']
|
||||
13
coin/platform_configs/qtbridge-swift.yaml
Normal file
13
coin/platform_configs/qtbridge-swift.yaml
Normal file
@@ -0,0 +1,13 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
quick-bridges.yaml: [
|
||||
"macos-quick-bridges"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'macos-quick-bridges-swift'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
|
||||
@@ -10,13 +10,6 @@ Include: [
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-dotnet'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']
|
||||
|
||||
-
|
||||
Id: 'windows-quick-bridges-rust'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
@@ -5,7 +5,7 @@ Configurations:
|
||||
Id: 'qtgp-on-linux-rhel_9_6'
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly']
|
||||
Features: ['Packaging', 'UseConfigure']
|
||||
-
|
||||
Id: 'qtgp-on-macos'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
},
|
||||
"directory": "../work/qt/$(env:TESTED_MODULE_COIN)",
|
||||
"ir": "$(env:IRNAME)",
|
||||
"name": "qt_$(env:PACKAGE)_$(env:MODULE)_(env:TESTED_MODULE_BRANCH_COIN)_$(env:TARGET_OS_COIN)"
|
||||
"name": "qt_$(env:PACKAGE)_$(env:MODULE)_$(env:TESTED_MODULE_BRANCH_COIN)_$(env:TARGET_OS_COIN)"
|
||||
},
|
||||
"VCSIntegration": {
|
||||
"vcs_mapping": {
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
|
||||
echo "Installing vcpkg android ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
|
||||
|
||||
|
||||
3
coin/provisioning/common/macos/install-lipomerge.sh
Executable file
3
coin/provisioning/common/macos/install-lipomerge.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
pip3 install --user lipomerge
|
||||
13
coin/provisioning/common/shared/triplets/arm64-osx-qt.cmake
Normal file
13
coin/provisioning/common/shared/triplets/arm64-osx-qt.cmake
Normal file
@@ -0,0 +1,13 @@
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
|
||||
set(VCPKG_OSX_ARCHITECTURES arm64)
|
||||
set(VCPKG_TARGET_ARCHITECTURE arm64)
|
||||
|
||||
# Default settings of the triplet from the official vcpkg registry
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
|
||||
# Qt custom per-port customizations
|
||||
if(PORT MATCHES "openssl")
|
||||
set(VCPKG_LIBRARY_LINKAGE dynamic)
|
||||
set(VCPKG_FIXUP_ELF_RPATH ON)
|
||||
endif()
|
||||
13
coin/provisioning/common/shared/triplets/x64-osx-qt.cmake
Normal file
13
coin/provisioning/common/shared/triplets/x64-osx-qt.cmake
Normal file
@@ -0,0 +1,13 @@
|
||||
set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
|
||||
set(VCPKG_OSX_ARCHITECTURES x86_64)
|
||||
set(VCPKG_TARGET_ARCHITECTURE x64)
|
||||
|
||||
# Default settings of the triplet from the official vcpkg registry
|
||||
set(VCPKG_CRT_LINKAGE dynamic)
|
||||
set(VCPKG_LIBRARY_LINKAGE static)
|
||||
|
||||
# Qt custom per-port customizations
|
||||
if(PORT MATCHES "openssl")
|
||||
set(VCPKG_LIBRARY_LINKAGE dynamic)
|
||||
set(VCPKG_FIXUP_ELF_RPATH ON)
|
||||
endif()
|
||||
@@ -5,5 +5,5 @@
|
||||
"repository": "https://git.qt.io/aledelev/vcpkg",
|
||||
"baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
|
||||
},
|
||||
"overlay-triplets": [ "./../../shared/triplets" ]
|
||||
"overlay-triplets": [ "./../triplets" ]
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
vcpkg_tool_release_tag=2025-09-03
|
||||
windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
|
||||
windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
|
||||
linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
|
||||
unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
|
||||
|
||||
@@ -7,12 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
echo "Installing vcpkg ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
|
||||
install_root=x64-linux-qt-tmp
|
||||
install_root=$1-tmp
|
||||
vcpkg_extra_args=$2
|
||||
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug $vcpkg_extra_args
|
||||
|
||||
cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
|
||||
"-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\
|
||||
@@ -34,7 +34,7 @@ do
|
||||
"vcpkg_tool_release_tag")
|
||||
vcpkgToolReleaseTag=${keyValue[1]}
|
||||
;;
|
||||
"linux_checksum")
|
||||
"unix_checksum")
|
||||
vcpkgToolChecksum=${keyValue[1]}
|
||||
;;
|
||||
esac
|
||||
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
|
||||
export VCPKG_ROOT="$vcpkgRoot"
|
||||
|
||||
# Set a source for vcpkg Binary and Asset Cache
|
||||
# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
|
||||
# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
|
||||
# mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
|
||||
# $HOME/vcpkg-cache/
|
||||
export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"
|
||||
20
coin/provisioning/common/windows/install-nuget.ps1
Normal file
20
coin/provisioning/common/windows/install-nuget.ps1
Normal file
@@ -0,0 +1,20 @@
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$script:nugetVersion = "v6.11.0"
|
||||
$script:nugetPackage = "nuget_$nugetVersion.exe"
|
||||
$script:packageRoot = "C:\Utils\NuGet\"
|
||||
|
||||
$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
|
||||
$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
|
||||
$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
|
||||
$script:package_path = "$packageRoot\\$nugetPackage"
|
||||
|
||||
New-Item -ItemType Directory -Path "$packageRoot"
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing Nuget"
|
||||
|
||||
Set-EnvironmentVariable "NUGET_EXE_PATH" "$package_path"
|
||||
@@ -7,9 +7,7 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
|
||||
$vcpkgRoot = "$env:VCPKG_ROOT"
|
||||
$vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\vcpkg"
|
||||
Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
|
||||
Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug"
|
||||
|
||||
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
|
||||
|
||||
@@ -10,9 +10,7 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
|
||||
$vcpkgRoot = "$env:VCPKG_ROOT"
|
||||
$vcpkgInstallRoot = "$arch-windows-qt-tmp"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\vcpkg"
|
||||
Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
|
||||
Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug"
|
||||
|
||||
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
|
||||
|
||||
89
coin/provisioning/common/windows/install_configure_vcam.ps1
Normal file
89
coin/provisioning/common/windows/install_configure_vcam.ps1
Normal file
@@ -0,0 +1,89 @@
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$script:commitSha = "a8c4d08c9757c1689d832a33252ae465b97bfb9a"
|
||||
$script:repoUrl = "https://git.qt.io/qtmultimedia/WindowsVirtualCamera/-/archive/$commitSha/WindowsVirtualCamera-$commitSha.zip"
|
||||
$script:unzip_location = "C:\Utils\WindowsVirtualCamera"
|
||||
$script:download_location = "C:\Windows\Temp\WindowsVirtualCamera.zip"
|
||||
|
||||
$script:nuget = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine)
|
||||
|
||||
$script:localPath = "$unzip_location\WindowsVirtualCamera-$commitSha"
|
||||
$script:solutionFile = "VCamManager.sln"
|
||||
$script:buildConfig = "Release"
|
||||
$script:targetPlatform = "x64"
|
||||
$script:dllPath = "$localPath\$targetPlatform\$buildConfig\VCamSampleSource.dll"
|
||||
|
||||
# Save the current location to return later
|
||||
$previousLocation = Get-Location
|
||||
|
||||
Write-Host "Downloading from $repoUrl to $download_location"
|
||||
Invoke-WebRequest -Uri $repoUrl -OutFile $download_location
|
||||
Write-Host "Extracting $download_location to $unzip_location"
|
||||
Expand-Archive -Path $download_location -DestinationPath $unzip_location
|
||||
Remove-Item $download_location
|
||||
|
||||
# Ensure we're inside repo folder
|
||||
Set-Location $localPath
|
||||
|
||||
$hostArch = Get-CpuArchitecture
|
||||
$arch = $hostArch
|
||||
$result = EnterVSDevShell -HostArch $hostArch -Arch $arch
|
||||
if (-Not $result) {
|
||||
return $false
|
||||
}
|
||||
|
||||
Write-Host "Locating MSBuild"
|
||||
$vswhere = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
|
||||
|
||||
if (-not (Test-Path $vswhere)) {
|
||||
throw "vswhere.exe not found! Path: $vswhere"
|
||||
}
|
||||
|
||||
$msbuildPath = & $vswhere `
|
||||
-latest `
|
||||
-products * `
|
||||
-requires Microsoft.Component.MSBuild `
|
||||
-requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 `
|
||||
-find "MSBuild\**\Bin\MSBuild.exe" `
|
||||
|
||||
if ($LASTEXITCODE -ne 0 -or -not (Test-Path $msbuildPath)) {
|
||||
throw "MSBuild NOT found. Make sure VS Build Tools are installed."
|
||||
}
|
||||
Write-Host "MSBuild found: $msbuildPath"
|
||||
|
||||
Write-Host "Restoring NuGet packages"
|
||||
& $nuget restore $solutionFile
|
||||
|
||||
Write-Host "Building solution $solutionFile"
|
||||
& "$msbuildPath" $solutionFile `
|
||||
/t:Build `
|
||||
/p:Configuration=$buildConfig `
|
||||
/p:Platform=$targetPlatform `
|
||||
/p:RestorePackagesConfig=true `
|
||||
/m
|
||||
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
Write-Host "Build succeeded"
|
||||
} else {
|
||||
Write-Host " Build failed with exit code $LASTEXITCODE"
|
||||
exit $LASTEXITCODE
|
||||
}
|
||||
|
||||
Write-Host "Registering the Virtual Camera dll"
|
||||
regsvr32 /s "$dllPath"
|
||||
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
Write-Host "Register succeeded"
|
||||
} else {
|
||||
Write-Host "Register failed with exit code $LASTEXITCODE"
|
||||
exit $LASTEXITCODE
|
||||
}
|
||||
|
||||
Set-EnvironmentVariable "VCAM_PATH" "$localPath\$targetPlatform\$buildConfig"
|
||||
Write-Host "Environment variable VCAM_PATH set to $localPath\$targetPlatform\$buildConfig"
|
||||
|
||||
# Return to previous location
|
||||
Set-Location $previousLocation
|
||||
@@ -1,14 +0,0 @@
|
||||
{
|
||||
"overrides": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.0.7",
|
||||
"port-version": 2
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
"protobuf",
|
||||
"grpc"
|
||||
]
|
||||
}
|
||||
@@ -1,20 +1,14 @@
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs Windows App SDK
|
||||
|
||||
$script:nugetVersion = "v6.11.0"
|
||||
$script:nugetPackage = "nuget_$nugetVersion.exe"
|
||||
$script:packageRoot = "C:\Utils\WindowsAppSdk\"
|
||||
|
||||
$script:cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\nuget\$nugetPackage"
|
||||
$script:officialUrl = "https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe"
|
||||
$script:sdkChecksumSha1 = "5443887cfb5283da5021388d146ebb5febdc82e9"
|
||||
$script:package_path = "$packageRoot\\$nugetPackage"
|
||||
$script:package_path = [System.Environment]::GetEnvironmentVariable('NUGET_EXE_PATH', [System.EnvironmentVariableTarget]::Machine)
|
||||
|
||||
New-Item -ItemType Directory -Path "$packageRoot"
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing Nuget"
|
||||
Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
|
||||
|
||||
$script:cpuarch = Get-CpuArchitecture
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
|
||||
|
||||
# Installing common ports
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
# Installing platform specific ports
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -8,7 +8,7 @@ echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}"
|
||||
|
||||
# Installing common ports
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
# Installing platform specific ports
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
2
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/42-install-vcpkg-ports.sh
Normal file → Executable file
2
coin/provisioning/qtci-linux-RHEL-9.6-x86_64/42-install-vcpkg-ports.sh
Normal file → Executable file
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -227,6 +227,8 @@ installPackages+=(bridge-utils)
|
||||
# For Debian packaging
|
||||
installPackages+=(sbuild)
|
||||
installPackages+=(ubuntu-dev-tools)
|
||||
# To create deb package out of openapi-generator-cli.jar
|
||||
installPackages+=(debhelper-compat)
|
||||
# cifs-utils, for mounting smb drive
|
||||
installPackages+=(keyutils)
|
||||
installPackages+=(cifs-utils)
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/41-install-vcpkg.sh
Normal file → Executable file
2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/41-install-vcpkg.sh
Normal file → Executable file
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
|
||||
2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/42-install-vcpkg-ports.sh
Normal file → Executable file
2
coin/provisioning/qtci-linux-openSUSE-16.0-x86_64/42-install-vcpkg-ports.sh
Normal file → Executable file
@@ -3,4 +3,4 @@
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/linux/install-vcpkg-ports.sh"
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-linux-qt
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
7
coin/provisioning/qtci-macos-13-arm/28-patchelf.sh
Executable file
7
coin/provisioning/qtci-macos-13-arm/28-patchelf.sh
Executable file
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2025 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
|
||||
6
coin/provisioning/qtci-macos-13-arm/31-install-vcpkg.sh
Normal file
6
coin/provisioning/qtci-macos-13-arm/31-install-vcpkg.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-13-arm/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-13-x86_64/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
6
coin/provisioning/qtci-macos-14-arm/31-install-vcpkg.sh
Normal file
6
coin/provisioning/qtci-macos-14-arm/31-install-vcpkg.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-14-arm/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-14-x86_64/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
5
coin/provisioning/qtci-macos-15-arm/28-patchelf.sh
Executable file
5
coin/provisioning/qtci-macos-15-arm/28-patchelf.sh
Executable file
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2024 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
|
||||
6
coin/provisioning/qtci-macos-15-arm/31-install-vcpkg.sh
Normal file
6
coin/provisioning/qtci-macos-15-arm/31-install-vcpkg.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-15-arm/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/macos/install-lipomerge.sh"
|
||||
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
10
coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh
Executable file
10
coin/provisioning/qtci-macos-15-x86_64/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,10 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt --host-triplet=arm64-osx
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" x64-osx-qt --host-triplet=x64-osx
|
||||
|
||||
python3 -m lipomerge $VCPKG_ROOT/installed/arm64-osx-qt $VCPKG_ROOT/installed/x64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
find $VCPKG_ROOT/installed/universal-osx-qt -name '*.cmake' -exec sed -i .bak -E 's,/(arm64|x64)-osx(-qt)?/,/universal-osx-qt/,g' '{}' \;
|
||||
5
coin/provisioning/qtci-macos-26-arm/28-patchelf.sh
Executable file
5
coin/provisioning/qtci-macos-26-arm/28-patchelf.sh
Executable file
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2024 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh"
|
||||
6
coin/provisioning/qtci-macos-26-arm/31-install-vcpkg.sh
Normal file
6
coin/provisioning/qtci-macos-26-arm/31-install-vcpkg.sh
Normal file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg.sh"
|
||||
9
coin/provisioning/qtci-macos-26-arm/32-install-vcpkg-ports.sh
Executable file
9
coin/provisioning/qtci-macos-26-arm/32-install-vcpkg-ports.sh
Executable file
@@ -0,0 +1,9 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/install-vcpkg-ports.sh" arm64-osx-qt
|
||||
|
||||
# Create an alias for arm64-osx-qt, because the built package references this triplet.
|
||||
ln -s arm64-osx-qt $VCPKG_ROOT/installed/universal-osx-qt
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-nuget.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install_configure_vcam.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-nuget.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install_configure_vcam.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-nuget.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-nuget.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install_configure_vcam.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install-nuget.ps1"
|
||||
@@ -0,0 +1 @@
|
||||
. "$PSScriptRoot\..\common\windows\install_configure_vcam.ps1"
|
||||
@@ -4,3 +4,4 @@
|
||||
. "$PSScriptRoot\..\common\windows\helpers.ps1"
|
||||
|
||||
Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList 'modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Professional" --add Microsoft.VisualStudio.Workload.ManagedDesktop --quiet' -Wait
|
||||
Start-Process -FilePath "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vs_installer.exe" -ArgumentList 'modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Professional" --add Microsoft.VisualStudio.Workload.NativeDesktop --quiet' -Wait
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 6e787d7b04...d9dd2e502d
Submodule qt5compat updated: 3301e89719...fabb529c65
Submodule qtactiveqt updated: 299bad24d2...9352a949d7
2
qtbase
2
qtbase
Submodule qtbase updated: 4fd88011fa...58d3298c93
Submodule qtcanvaspainter updated: 72f1e949b8...f902467164
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 901817e9ad...f96b4d7e86
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 22b94f6895...99658340dd
Submodule qtconnectivity updated: 430330375d...f11c3008da
Submodule qtdatavis3d updated: 329078e3b6...835ba5fb4a
Submodule qtdeclarative updated: fc162d455e...f0151a32cc
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 837135efba...6e172a407c
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 8a6f876b80...66bf15e38e
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: 9be138190a...24d4eae21f
Submodule qthttpserver updated: 72d80eb8a1...93e21b028d
Submodule qtimageformats updated: b10840596e...a58493487f
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user