mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-20 05:45:59 +08:00
Compare commits
67 Commits
v6.11.0-be
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3a7915481f | ||
|
|
4263429114 | ||
|
|
606a8b29c8 | ||
|
|
51bcd64151 | ||
|
|
b9c677baad | ||
|
|
90d17e93a9 | ||
|
|
bb4d800bd6 | ||
|
|
98688fe265 | ||
|
|
c16277f9d3 | ||
|
|
6568c2622c | ||
|
|
31ea7c6c4a | ||
|
|
4d1ec89791 | ||
|
|
674655fe32 | ||
|
|
4466bd8555 | ||
|
|
8fd9b78872 | ||
|
|
5476a35d44 | ||
|
|
2b4ab5519b | ||
|
|
2450189a4f | ||
|
|
a1289ed5d5 | ||
|
|
bee5ded33b | ||
|
|
dc592b73d6 | ||
|
|
9a13282256 | ||
|
|
5579337dde | ||
|
|
4456a7f592 | ||
|
|
da911f9b20 | ||
|
|
406dca5bf3 | ||
|
|
9c05c68c86 | ||
|
|
8fb136fc8a | ||
|
|
f032c3156d | ||
|
|
e98fab4c4e | ||
|
|
e6c1ad7c0b | ||
|
|
dd0dae532f | ||
|
|
a98c97ed95 | ||
|
|
c5a42f267f | ||
|
|
2bac4d3be9 | ||
|
|
e3966f2ffc | ||
|
|
6bd3b23b6c | ||
|
|
02beaf2090 | ||
|
|
45aeb45a6e | ||
|
|
4bff151490 | ||
|
|
2795f20a4e | ||
|
|
90a2d21db6 | ||
|
|
c69a56646f | ||
|
|
e9a003f0c3 | ||
|
|
88173877d6 | ||
|
|
6f4c400406 | ||
|
|
df82dc7de2 | ||
|
|
160e6135bb | ||
|
|
d6918d7ac5 | ||
|
|
740e232f16 | ||
|
|
3a7f17e0cd | ||
|
|
da6cc0ce0e | ||
|
|
2bd7830030 | ||
|
|
fb6a8b0215 | ||
|
|
ba6a77312d | ||
|
|
c9a8b8f220 | ||
|
|
8a70b9e482 | ||
|
|
bc6ba67934 | ||
|
|
f0b54a51f7 | ||
|
|
bb77943c0f | ||
|
|
73c4ed922a | ||
|
|
7c7bbfff4d | ||
|
|
8d9d8cf3e8 | ||
|
|
6856189287 | ||
|
|
d5bdd4dea6 | ||
|
|
b276b549f7 | ||
|
|
dcd07cc2ab |
92
.gitmodules
vendored
92
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qttasktree qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -68,7 +68,7 @@
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = deprecated
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = deprecated
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = deprecated
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,107 +252,107 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
recommends = qtwebsockets
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = addon
|
||||
[submodule "qttasktree"]
|
||||
depends = qtbase
|
||||
path = qttasktree
|
||||
url = ../qttasktree.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qtopenapi"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtopenapi
|
||||
url = ../qtopenapi.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = preview
|
||||
[submodule "qtcanvaspainter"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtcanvaspainter
|
||||
url = ../qtcanvaspainter.git
|
||||
branch = 6.11
|
||||
branch = dev
|
||||
status = preview
|
||||
|
||||
@@ -102,18 +102,27 @@ endfunction()
|
||||
# - ../qt/qttools-litehtml.git
|
||||
function(qt_ir_add_git_remotes repo_relative_url working_directory)
|
||||
set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/")
|
||||
set(gerrit_repo_url "${gerrit_ssh_base}")
|
||||
set(gerrit_https_base "https://@USER@codereview.qt-project.org@AUTH@/")
|
||||
|
||||
qt_ir_get_option_value(codereview-username username)
|
||||
qt_ir_get_option_value(codereview-https https)
|
||||
|
||||
if(https)
|
||||
set(gerrit_repo_url "${gerrit_https_base}")
|
||||
else()
|
||||
set(gerrit_repo_url "${gerrit_ssh_base}")
|
||||
endif()
|
||||
|
||||
# If given a username, make a "verbose" remote.
|
||||
# Otherwise, rely on proper SSH configuration.
|
||||
if(username)
|
||||
string(REPLACE "@USER@" "${username}@" gerrit_repo_url "${gerrit_repo_url}")
|
||||
string(REPLACE "@PORT@" ":29418" gerrit_repo_url "${gerrit_repo_url}")
|
||||
string(REPLACE "@AUTH@" "/a" gerrit_repo_url "${gerrit_repo_url}")
|
||||
else()
|
||||
string(REPLACE "@USER@" "" gerrit_repo_url "${gerrit_repo_url}")
|
||||
string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
|
||||
string(REPLACE "@AUTH@" "" gerrit_repo_url "${gerrit_repo_url}")
|
||||
endif()
|
||||
|
||||
set(namespace "qt")
|
||||
|
||||
@@ -98,6 +98,9 @@ Options:
|
||||
username and port number, and thus relies on a correct SSH
|
||||
configuration.
|
||||
|
||||
--codereview-https
|
||||
Specify this option to use HTTPs instead of SSH.
|
||||
|
||||
--alternates <path to other Qt5 repo>
|
||||
Adds alternates for each submodule to another full qt5 checkout.
|
||||
This makes this qt5 checkout very small, as it will use the object
|
||||
|
||||
@@ -14,6 +14,7 @@ macro(qt_ir_set_known_command_line_options)
|
||||
qt_ir_commandline_option(berlin TYPE boolean)
|
||||
qt_ir_commandline_option(branch TYPE boolean)
|
||||
qt_ir_commandline_option(codereview-username TYPE string)
|
||||
qt_ir_commandline_option(codereview-https TYPE boolean)
|
||||
qt_ir_commandline_option(copy-objects TYPE boolean)
|
||||
qt_ir_commandline_option(fetch TYPE boolean DEFAULT_VALUE yes)
|
||||
qt_ir_commandline_option(force SHORT_NAME f TYPE boolean)
|
||||
|
||||
@@ -51,7 +51,7 @@ Configurations:
|
||||
'ANDROID_EMULATOR=emulator_x86_api_28'
|
||||
]
|
||||
-
|
||||
Id: 'android-15-x86_64-on-linux'
|
||||
Id: 'android-16-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
@@ -67,21 +67,5 @@ Configurations:
|
||||
# configuration, to ensure builds without this option work too.
|
||||
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_64_api_35'
|
||||
]
|
||||
-
|
||||
Id: 'android-16-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.6'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_64_api_36'
|
||||
]
|
||||
|
||||
@@ -10,7 +10,7 @@ Configurations:
|
||||
Platform dependency: [
|
||||
'rhel-9.6',
|
||||
'android-9-x86-on-linux',
|
||||
'android-15-x86_64-on-linux'
|
||||
'android-16-x86_64-on-linux'
|
||||
]
|
||||
Features: [
|
||||
'Sccache',
|
||||
@@ -24,7 +24,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
|
||||
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
|
||||
'ANDROID_EMULATOR=emulator_x86_api_28'
|
||||
]
|
||||
|
||||
@@ -12,11 +12,13 @@ Configurations:
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Target arch: 'x86_64-arm64'
|
||||
Features: ['Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
|
||||
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)
|
||||
@@ -41,6 +43,13 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-26-x86_64-tests'
|
||||
Template: 'qtci-macos-26-x86_64-101'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging', 'DoNotAbortTestingOnFirstFailure']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
Environment variables: [ 'COIN_CTEST_IGNORE_EXIT_CODE=1' ]
|
||||
|
||||
# And arm64
|
||||
|
||||
@@ -81,6 +90,18 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
|
||||
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'
|
||||
Template: 'qtci-macos-26-x86_64-101'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
@@ -94,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'
|
||||
@@ -104,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'
|
||||
]
|
||||
|
||||
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 @@ Include: [
|
||||
'android-arm64-on-macos',
|
||||
'android-armv7-on-windows',
|
||||
'android-9-x86-on-linux',
|
||||
'android-15-x86_64-on-linux'
|
||||
'android-16-x86_64-on-linux'
|
||||
],
|
||||
offline_documentation.yaml
|
||||
]
|
||||
|
||||
@@ -4,12 +4,12 @@ plugins {
|
||||
|
||||
android {
|
||||
namespace 'com.example.gradle_project'
|
||||
compileSdk 35
|
||||
compileSdk 36
|
||||
|
||||
defaultConfig {
|
||||
applicationId "com.example.gradle_project"
|
||||
minSdk 28
|
||||
targetSdk 35
|
||||
targetSdk 36
|
||||
versionCode 1
|
||||
versionName "1.0"
|
||||
}
|
||||
|
||||
@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
|
||||
toolsVersion="19.0"
|
||||
toolsFile="commandlinetools-linux-13114758_latest.zip"
|
||||
toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
|
||||
sdkBuildToolsVersion="35.0.1"
|
||||
sdkApiLevel="android-35"
|
||||
sdkBuildToolsVersion="36.0.0"
|
||||
sdkApiLevel="android-36"
|
||||
toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"
|
||||
|
||||
ndkVersionLatest="r27c"
|
||||
@@ -184,45 +184,27 @@ echo "Unzipping the Android 9 to $minVersionDestination"
|
||||
sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
|
||||
rm "$minVersionFilePath"
|
||||
|
||||
echo "Download and unzip Android 15 System Image"
|
||||
maxVersionFileName="x86_64-35_r08.zip"
|
||||
maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/"
|
||||
echo "Download and unzip Android 16 System Image"
|
||||
maxVersionFileName="x86_64-36_r07.zip"
|
||||
maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
|
||||
maxVersionFilePath="$maxVersionDestination/$maxVersionFileName"
|
||||
maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName"
|
||||
maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName"
|
||||
maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b"
|
||||
maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817"
|
||||
|
||||
mkdir -p "$maxVersionDestination"
|
||||
DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
|
||||
|
||||
echo "Unzipping the Android 15 to $maxVersionDestination"
|
||||
echo "Unzipping the Android 16 to $maxVersionDestination"
|
||||
sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
|
||||
rm "$maxVersionFilePath"
|
||||
|
||||
echo "Download and unzip Android 16 System Image for insignificant"
|
||||
insignificantMaxVersionFileName="x86_64-36_r06.zip"
|
||||
insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/"
|
||||
insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionSha1="a9b0b4a0488e0c6c380f5485507950f011388511"
|
||||
|
||||
mkdir -p "$insignificantMaxVersionDestination"
|
||||
DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
|
||||
|
||||
echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination"
|
||||
sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
|
||||
rm "$insignificantMaxVersionFilePath"
|
||||
|
||||
echo "Checking the contents of Android SDK again..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
|
||||
-k "system-images;android-28;google_apis;x86"
|
||||
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
|
||||
-k "system-images;android-35;google_apis;x86_64"
|
||||
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
|
||||
-k "system-images;android-36;google_apis;x86_64"
|
||||
|
||||
|
||||
@@ -51,13 +51,13 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-CtorMissingParentArgument": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-DetachingTemporary": {
|
||||
"_active": true
|
||||
},
|
||||
"Qt-FullyQualifiedMocTypes": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-FunctionArgsByValueRef": {
|
||||
"_active": false
|
||||
@@ -69,13 +69,13 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-Generic-InitializeAllFieldsInConstructor": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-Generic-MissingBaseCopy": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-Generic-MissingIncludeGuard": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-Generic-MissingTrCall": {
|
||||
"_active": true
|
||||
@@ -84,7 +84,7 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-Generic-NoFunctionDefinitionInHeader": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-Generic-NoIrregularInclude": {
|
||||
"_active": true
|
||||
@@ -114,7 +114,7 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-IncorrectEmit": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-InstallEventFilter": {
|
||||
"_active": true
|
||||
@@ -129,16 +129,16 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-MissingQObjectMacro": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-MutableContainerKey": {
|
||||
"_active": true
|
||||
},
|
||||
"Qt-NonPodGlobalStatic": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-OldStyleConnect": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-OverloadedSignal": {
|
||||
"_active": true
|
||||
@@ -162,7 +162,7 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-QPropertyWithoutNotify": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-QStringArg": {
|
||||
"_active": true
|
||||
@@ -186,7 +186,7 @@
|
||||
"_active": true
|
||||
},
|
||||
"Qt-RuleOfThree": {
|
||||
"_active": true
|
||||
"_active": false
|
||||
},
|
||||
"Qt-RuleOfTwoSoft": {
|
||||
"_active": true
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -41,9 +41,11 @@ ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa"
|
||||
|
||||
ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK install in provisioning
|
||||
ndkSha1Nightly1=$ndkSha1Latest
|
||||
|
||||
ndkVersionNightly2=$ndkVersionLatest
|
||||
ndkSha1Nightly2=$ndkSha1Latest
|
||||
sdkBuildToolsVersion="36.0.0"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-36"
|
||||
|
||||
toolsTargetFile="/tmp/$toolsFile"
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
|
||||
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
|
||||
@@ -7,7 +7,6 @@
|
||||
# Mimer SQL is needed for Qt to be able to support Mimer SQL
|
||||
|
||||
set -ex
|
||||
os="$1"
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
|
||||
@@ -7,6 +7,7 @@ set -euox pipefail
|
||||
lib_dir="$1/lib"
|
||||
additional_suffix="${2:-}"
|
||||
set_rpath="${3:-yes}"
|
||||
page_size="${4:-}"
|
||||
|
||||
# readelf and patchelf are prerequisite tools for this script. Check
|
||||
# that they are available.
|
||||
@@ -81,7 +82,12 @@ for lib_name in "${ffmpeg_libs[@]}"; do
|
||||
stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix
|
||||
fi
|
||||
|
||||
patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
|
||||
additional_command_args=""
|
||||
if [ -n "$page_size" ]; then
|
||||
additional_command_args+="--page-size ${page_size}"
|
||||
fi
|
||||
|
||||
patchelf ${additional_command_args} --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path"
|
||||
fi
|
||||
done <<< "$(read_needed_deps)"
|
||||
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
FROM ubuntu:16.04
|
||||
ARG COIN_RUNS_IN_QT_COMPANY
|
||||
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
|
||||
&& sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
|
||||
|| echo "Internal package repository not found. Using public repositories."
|
||||
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
|
||||
&& { printf '%s\n' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-amd64 main restricted universe multiverse' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-updates-amd64 main restricted universe multiverse' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-backports-amd64 main restricted universe' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 xenial-security-amd64 main restricted universe multiverse' \
|
||||
> /etc/apt/sources.list; \
|
||||
} \
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
FROM ubuntu:18.04
|
||||
ARG COIN_RUNS_IN_QT_COMPANY
|
||||
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
|
||||
&& sed -i 's;\(archive\|security\)\.ubuntu\.com;repo-clones.ci.qt.io/apt-mirror/mirror;' /etc/apt/sources.list \
|
||||
|| echo "Internal package repository not found. Using public repositories."
|
||||
RUN test x"$COIN_RUNS_IN_QT_COMPANY" = xtrue \
|
||||
&& { printf '%s\n' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe' \
|
||||
'deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse' \
|
||||
> /etc/apt/sources.list; \
|
||||
} \
|
||||
|
||||
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
|
||||
|
||||
@@ -116,7 +116,7 @@ set_common_environment () {
|
||||
CMD_INSTALL="sudo install"
|
||||
|
||||
COIN_RUNS_IN_QT_COMPANY=false
|
||||
if ping -c1 repo-clones.ci.qt.io >/dev/null 2>&1
|
||||
if ping -c1 repo-clones-apt.ci.qt.io >/dev/null 2>&1
|
||||
then
|
||||
COIN_RUNS_IN_QT_COMPANY=true
|
||||
fi
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
ffmpeg_version_default() {
|
||||
echo "n7.1.2"
|
||||
echo "n7.1.3"
|
||||
}
|
||||
|
||||
download_ffmpeg() {
|
||||
local version="${1:-$(ffmpeg_version_default)}"
|
||||
local sha1="${2:-1e4e937facdbde15943dd093121836bf69f27c7c}"
|
||||
local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
|
||||
|
||||
local ffmpeg_name="FFmpeg-$version"
|
||||
local target_dir="$HOME"
|
||||
|
||||
@@ -82,12 +82,13 @@ build_ffmpeg_android() {
|
||||
local cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang
|
||||
local ar=${toolchain_bin}/llvm-ar
|
||||
local ranlib=${toolchain_bin}/llvm-ranlib
|
||||
local strip=${toolchain_bin}/llvm-strip
|
||||
local ffmpeg_config_options
|
||||
|
||||
ffmpeg_config_options=$(get_ffmpeg_config_options $build_type)
|
||||
ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
|
||||
ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
|
||||
ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
|
||||
ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib} --strip=${strip}"
|
||||
ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
|
||||
if [ $page_size == "use_16kb_page_size" ]; then
|
||||
ffmpeg_config_options+=" --extra-ldflags=-Wl,-z,max-page-size=16384"
|
||||
@@ -115,7 +116,13 @@ build_ffmpeg_android() {
|
||||
|
||||
if [[ "$build_type" == "shared" ]]; then
|
||||
local fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh"
|
||||
sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no"
|
||||
|
||||
local page_size_arg=""
|
||||
if [ $page_size == "use_16kb_page_size" ]; then
|
||||
page_size_arg="16384"
|
||||
fi
|
||||
|
||||
sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ if [[ "$os" == "linux" ]]; then
|
||||
make && make install_sw install_ssldirs
|
||||
SetEnvVar "OPENSSL_HOME" "$opensslHome"
|
||||
SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
|
||||
SetEnvVar "PKG_CONFIG_PATH" "\"$opensslHome/lib64/pkgconfig:\$PKG_CONFIG_PATH\""
|
||||
if uname -a |grep -q "Debian"; then
|
||||
SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\""
|
||||
else
|
||||
|
||||
@@ -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"
|
||||
@@ -41,8 +41,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-
|
||||
$toolsVersion = "19.0"
|
||||
$toolsFile = "commandlinetools-win-13114758_latest.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-35"
|
||||
$sdkBuildToolsVersion = "35.0.1"
|
||||
$sdkApiLevel = "android-36"
|
||||
$sdkBuildToolsVersion = "36.0.0"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
$toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"
|
||||
|
||||
@@ -7,9 +7,9 @@
|
||||
# This script will install FFmpeg
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
|
||||
$version="n7.1.2"
|
||||
$version="n7.1.3"
|
||||
$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
$sha1="1e4e937facdbde15943dd093121836bf69f27c7c"
|
||||
$sha1="27051817deec88bed3b9652d49f9127d22268d83"
|
||||
$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
$ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
||||
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
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
|
||||
done
|
||||
sudo yum -y remove PackageKit gnome-software
|
||||
|
||||
sudo subscription-manager config --rhsm.manage_repos=1
|
||||
sudo subscription-manager config --rhsm.manage_repos=0
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# List available RHEL versions and bind with correct one
|
||||
@@ -22,10 +22,35 @@ sudo subscription-manager release --list
|
||||
sudo subscription-manager release --set=8.10
|
||||
sudo yum clean all
|
||||
|
||||
# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
|
||||
sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
|
||||
[rhel-8-for-x86_64-baseos-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[rhel-8-for-x86_64-appstream-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[codeready-builder-for-rhel-8-x86_64-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
EOC
|
||||
|
||||
# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
|
||||
sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
|
||||
installPackages+=(git)
|
||||
installPackages+=(zlib-devel)
|
||||
installPackages+=(glib2-devel)
|
||||
installPackages+=(openssl3)
|
||||
installPackages+=(openssl3-devel)
|
||||
installPackages+=(freetype-devel)
|
||||
installPackages+=(fontconfig-devel)
|
||||
installPackages+=(curl-devel)
|
||||
@@ -191,8 +189,5 @@ echo "GCC = $gccVersion" >> versions.txt
|
||||
glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "glibc = $glibcVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
# List all available updates
|
||||
sudo yum -y list updates
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -9,7 +9,7 @@ sudo systemctl stop packagekit
|
||||
sudo systemctl disable packagekit
|
||||
sudo yum -y remove PackageKit gnome-software
|
||||
|
||||
sudo subscription-manager config --rhsm.manage_repos=1
|
||||
sudo subscription-manager config --rhsm.manage_repos=0
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# List available RHEL versions and bind with correct one
|
||||
@@ -17,10 +17,35 @@ sudo subscription-manager release --list
|
||||
sudo subscription-manager release --set=8.4
|
||||
sudo yum clean all
|
||||
|
||||
# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
|
||||
sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
|
||||
[rhel-8-for-x86_64-baseos-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[rhel-8-for-x86_64-appstream-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[codeready-builder-for-rhel-8-x86_64-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
EOC
|
||||
|
||||
# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
|
||||
sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -14,7 +14,7 @@ while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do
|
||||
done
|
||||
sudo yum -y remove PackageKit gnome-software
|
||||
|
||||
sudo subscription-manager config --rhsm.manage_repos=1
|
||||
sudo subscription-manager config --rhsm.manage_repos=0
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# List available RHEL versions and bind with correct one
|
||||
@@ -22,10 +22,35 @@ sudo subscription-manager release --list
|
||||
sudo subscription-manager release --set=8.8
|
||||
sudo yum clean all
|
||||
|
||||
# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms'
|
||||
sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms'
|
||||
sudo tee "/etc/yum.repos.d/local.repo" > /dev/null <<EOC
|
||||
[rhel-8-for-x86_64-baseos-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-baseos-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Base OS (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[rhel-8-for-x86_64-appstream-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/rhel-8-for-x86_64-appstream-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux 8 Appstream (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
|
||||
[codeready-builder-for-rhel-8-x86_64-rpms]
|
||||
metadata_expire = 86400
|
||||
baseurl = http://repo-clones.ci.qt.io/repos/codeready-builder-for-rhel-8-x86_64-rpms
|
||||
ui_repoid_vars = releasever basearch
|
||||
name = Qt Red Hat Enterprise Linux Codeready Builder (RPMs)
|
||||
gpgkey = file:///etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
|
||||
enabled = 1
|
||||
gpgcheck = 1
|
||||
EOC
|
||||
|
||||
# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip'
|
||||
sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
|
||||
|
||||
|
||||
@@ -17,8 +17,6 @@ installPackages+=(ca-certificates)
|
||||
installPackages+=(git)
|
||||
installPackages+=(zlib-devel)
|
||||
installPackages+=(glib2-devel)
|
||||
installPackages+=(openssl3)
|
||||
installPackages+=(openssl3-devel)
|
||||
installPackages+=(freetype-devel)
|
||||
installPackages+=(fontconfig-devel)
|
||||
installPackages+=(curl-devel)
|
||||
@@ -184,8 +182,5 @@ echo "GCC = $gccVersion" >> versions.txt
|
||||
glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)"
|
||||
echo "glibc = $glibcVersion" >> versions.txt
|
||||
|
||||
OpenSSLVersion="$(openssl3 version |cut -b 9-14)"
|
||||
echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
# List all available updates
|
||||
sudo yum -y list updates
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.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
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.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
|
||||
|
||||
@@ -5,14 +5,11 @@
|
||||
|
||||
set -e
|
||||
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions_rhc.sh -o "/tmp/redhat_ak.sh" &>/dev/null
|
||||
sudo chmod 755 /tmp/redhat_ak.sh
|
||||
/tmp/redhat_ak.sh
|
||||
sudo /tmp/redhat_ak.sh
|
||||
|
||||
# refresh local certificates
|
||||
sudo subscription-manager refresh
|
||||
|
||||
# Attach available subscriptions to system. This is needed when subscriptions are renewed.
|
||||
sudo subscription-manager attach --auto
|
||||
|
||||
sudo rm -f /tmp/redhat_ak.sh
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -22,10 +22,10 @@ DownloadAndExtract () {
|
||||
|
||||
|
||||
# Axivion Bauhaus Suite
|
||||
version="7.10.5"
|
||||
version="7.11.1"
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
|
||||
targetFile="bauhaus-suite.tar.gz"
|
||||
sha1="59d996b3f66c928eb7063a8f66ec12eaf4e21318"
|
||||
sha1="5ec7bfacca1827dbf1fc70dcef4d9bfd842396aa"
|
||||
cd "$HOME"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -22,10 +22,10 @@ DownloadAndExtract () {
|
||||
|
||||
|
||||
# Axivion Bauhaus Suite
|
||||
version="7.10.5"
|
||||
version="7.11.1"
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-$version-x86_64-gnu_linux.tar.gz"
|
||||
targetFile="bauhaus-suite.tar.gz"
|
||||
sha1="59d996b3f66c928eb7063a8f66ec12eaf4e21318"
|
||||
sha1="5ec7bfacca1827dbf1fc70dcef4d9bfd842396aa"
|
||||
cd "$HOME"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile"
|
||||
|
||||
|
||||
@@ -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"
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user