mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-24 00:46:22 +08:00
Compare commits
54 Commits
dev
...
v6.9.0-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6e5ad2a7e8 | ||
|
|
be88fababd | ||
|
|
626a22cc74 | ||
|
|
db2d504099 | ||
|
|
c03c22faae | ||
|
|
3b9008ca75 | ||
|
|
27be5c2f98 | ||
|
|
77a614d592 | ||
|
|
55ef82de88 | ||
|
|
1bb142175a | ||
|
|
27b0c6daff | ||
|
|
ffb6de83c9 | ||
|
|
e732ea40d7 | ||
|
|
4eac58fb7c | ||
|
|
1b6c7cfa17 | ||
|
|
3579a0c95c | ||
|
|
f537715537 | ||
|
|
096d09d1a5 | ||
|
|
5b0d2e87d0 | ||
|
|
81f7f5b413 | ||
|
|
d0ead4f0a3 | ||
|
|
b07fbbf935 | ||
|
|
0148e13038 | ||
|
|
2c0ce8b3f2 | ||
|
|
91ba03e3b5 | ||
|
|
d78024c6d5 | ||
|
|
7b7a3ea702 | ||
|
|
db53942a70 | ||
|
|
9bfbeb48d9 | ||
|
|
5e74968c61 | ||
|
|
d777fa2926 | ||
|
|
34f15ccd11 | ||
|
|
36aa81cb1b | ||
|
|
0e4d9053fc | ||
|
|
3c2be7486c | ||
|
|
42097ba59d | ||
|
|
6db401beda | ||
|
|
51dec3728f | ||
|
|
b7abace894 | ||
|
|
32d895a2a0 | ||
|
|
5ae41db586 | ||
|
|
cfe773d749 | ||
|
|
22b3565849 | ||
|
|
d23693dc5e | ||
|
|
5622b33626 | ||
|
|
22ae1bb5ee | ||
|
|
d619cb643a | ||
|
|
1ff2454942 | ||
|
|
e583a0928b | ||
|
|
ab25d7a08b | ||
|
|
dc1f9e060a | ||
|
|
28e2fcc202 | ||
|
|
77e9af9920 | ||
|
|
8f7aafe9d3 |
86
.gitmodules
vendored
86
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -68,7 +68,7 @@
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = deprecated
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,88 +252,88 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
recommends = qtwebsockets
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = dev
|
||||
branch = 6.9
|
||||
status = addon
|
||||
|
||||
4
.gitreview
Normal file
4
.gitreview
Normal file
@@ -0,0 +1,4 @@
|
||||
[gerrit]
|
||||
host=codereview.qt-project.org
|
||||
project=qt/qt5
|
||||
defaultbranch=dev
|
||||
@@ -29,7 +29,7 @@ Windows:
|
||||
|
||||
1. Open a command prompt.
|
||||
2. Ensure that the following tools can be found in the path:
|
||||
* Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 11.2 or later)
|
||||
* Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later)
|
||||
* Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store)
|
||||
|
||||
```
|
||||
|
||||
@@ -93,9 +93,15 @@ function(qt_ir_run_git_submodule_init submodules working_directory)
|
||||
qt_ir_setup_commit_template("${working_directory}" "${working_directory}")
|
||||
endfunction()
|
||||
|
||||
# Add gerrit remotes to the repository.
|
||||
function(qt_ir_add_git_remotes repo_name working_directory)
|
||||
set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/")
|
||||
# Add gerrit remotes to the repository located in the working_directory.
|
||||
# repo_relative_url is the relative URL of the repository.
|
||||
# Examples:
|
||||
# - qt5
|
||||
# - qttools.git
|
||||
# - ../playground/qlitehtml.git
|
||||
# - ../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}")
|
||||
|
||||
qt_ir_get_option_value(codereview-username username)
|
||||
@@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory)
|
||||
string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}")
|
||||
endif()
|
||||
|
||||
string(APPEND gerrit_repo_url "${repo_name}")
|
||||
set(namespace "qt")
|
||||
set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}")
|
||||
qt_ir_normalize_git_url("${repo_relative_url_with_namespace}" normalized_url)
|
||||
string(APPEND gerrit_repo_url "${normalized_url}")
|
||||
|
||||
qt_ir_execute_process_and_log_and_handle_error(
|
||||
COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}"
|
||||
@@ -193,15 +202,21 @@ function(qt_ir_clone_one_submodule submodule_name)
|
||||
set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}")
|
||||
|
||||
set(submodule_url "${submodule_base_git_path}")
|
||||
qt_ir_has_url_scheme("${submodule_url}" has_url_scheme)
|
||||
qt_ir_parse_git_url(
|
||||
URL "${submodule_url}"
|
||||
OUT_VAR_HAS_URL_SCHEME has_url_scheme
|
||||
)
|
||||
|
||||
if(NOT has_url_scheme AND arg_BASE_URL)
|
||||
set(submodule_url "${arg_BASE_URL}${submodule_url}")
|
||||
qt_ir_normalize_git_url("${submodule_url}" submodule_url)
|
||||
endif()
|
||||
|
||||
qt_ir_get_mirror(mirror_url)
|
||||
set(mirror "")
|
||||
if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH))
|
||||
set(mirror "${mirror_url}${submodule_base_git_path}")
|
||||
qt_ir_normalize_git_url("${mirror}" mirror)
|
||||
endif()
|
||||
|
||||
set(mirror_or_original_url "${submodule_url}")
|
||||
|
||||
@@ -40,16 +40,77 @@ function(qt_ir_get_git_config_contents out_var)
|
||||
set(${out_var} "${git_output}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Checks whether the given url has a scheme like https:// or is just a
|
||||
# relative path.
|
||||
function(qt_ir_has_url_scheme url out_var)
|
||||
string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}")
|
||||
# Parses a git repo url to:
|
||||
# - check if the given url has a scheme like https:// or git:// or is just a
|
||||
# relative path with no scheme (possibly containing '../' segments)
|
||||
# - extracts the scheme if it exists
|
||||
# - extracts the url without the scheme
|
||||
function(qt_ir_parse_git_url)
|
||||
set(options "")
|
||||
set(oneValueArgs
|
||||
URL
|
||||
OUT_VAR_HAS_URL_SCHEME
|
||||
OUT_VAR_SCHEME
|
||||
OUT_VAR_URL_WITHOUT_SCHEME
|
||||
)
|
||||
set(multiValueArgs "")
|
||||
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
|
||||
|
||||
string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}")
|
||||
|
||||
if(url_scheme_match)
|
||||
set(has_url_scheme TRUE)
|
||||
set(scheme "${CMAKE_MATCH_1}")
|
||||
set(url_without_scheme "${CMAKE_MATCH_2}")
|
||||
else()
|
||||
set(has_url_scheme FALSE)
|
||||
set(scheme "")
|
||||
set(url_without_scheme "${url}")
|
||||
endif()
|
||||
|
||||
if(arg_OUT_VAR_HAS_URL_SCHEME)
|
||||
set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
if(arg_OUT_VAR_SCHEME)
|
||||
set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
if(arg_OUT_VAR_URL_WITHOUT_SCHEME)
|
||||
set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE)
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
# Normalizes a url that contains '../' path segments.
|
||||
# Removes the '../' segments and the directories that they precede.
|
||||
# Example:
|
||||
# git://code.qt.io/qt/../playground/qlitehtml.git
|
||||
# will be normalized to:
|
||||
# git://code.qt.io/playground/qlitehtml.git
|
||||
function(qt_ir_normalize_git_url url out_var)
|
||||
# The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
|
||||
# That got rid of ../ and ../../ in the path, but it broke down
|
||||
# when more than two '../' segments were present.
|
||||
#
|
||||
# In CMake, we instead parse the url to get the non-scheme suffix,
|
||||
# use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path
|
||||
# and then re-add the scheme if it was present.
|
||||
qt_ir_parse_git_url(
|
||||
URL "${url}"
|
||||
OUT_VAR_HAS_URL_SCHEME has_url_scheme
|
||||
OUT_VAR_SCHEME url_scheme
|
||||
OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme
|
||||
)
|
||||
|
||||
# Note the empty BASE_DIR is important, otherwise the path is relative to
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}.
|
||||
get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "")
|
||||
|
||||
if(has_url_scheme)
|
||||
set(${out_var} TRUE PARENT_SCOPE)
|
||||
else()
|
||||
set(${out_var} FALSE PARENT_SCOPE)
|
||||
string(PREPEND normalized_url "${url_scheme}")
|
||||
endif()
|
||||
|
||||
set(${out_var} "${normalized_url}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Parses a key-value line from a .git/config or .gitmodules file
|
||||
@@ -79,14 +140,22 @@ endmacro()
|
||||
# url_value
|
||||
# the url where to clone a repo from
|
||||
# in perl script it was called $base
|
||||
# e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git'
|
||||
# Examples:
|
||||
# - '../qtbase.git'
|
||||
# - 'https://code.qt.io/playground/qlitehtml.git'
|
||||
# - '../../playground/qlitehtml.git'
|
||||
# parent_repo_base_git_path
|
||||
# the base git path of the parent of the submodule
|
||||
# it is either a relative dir or a full url
|
||||
# in the perl script it was called $my_repo_base,
|
||||
# it was passed as first arg to git_clone_all_submodules,
|
||||
# it was passed the value of $subbases{$module} when doing recursive submodule cloning
|
||||
# e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git'
|
||||
# Examples:
|
||||
# - 'qt5'
|
||||
# - 'tqtc-qt5'
|
||||
# - 'qtdeclarative.git'
|
||||
# - 'qttools.git'
|
||||
# - 'https://code.qt.io/playground/qlitehtml.git'
|
||||
#
|
||||
# Outputs
|
||||
#
|
||||
@@ -94,21 +163,21 @@ endmacro()
|
||||
# just the value of ${url_value}
|
||||
# ${out_var_prefix}_${submodule_name}_base_git_path
|
||||
# the whole url if it has a scheme, otherwise it's the value of
|
||||
# ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed
|
||||
# e.g. 'qtdeclarative.git'
|
||||
# 'https://code.qt.io/playground/qlitehtml.git',
|
||||
# ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments
|
||||
# are collapsed depending on how many path segments are available in
|
||||
# ${parent_repo_base_git_path}.
|
||||
# Examples:
|
||||
# - 'qtdeclarative.git'
|
||||
# - 'https://code.qt.io/playground/qlitehtml.git'
|
||||
# - '../playground/qlitehtml.git'
|
||||
macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path)
|
||||
qt_ir_has_url_scheme("${url_value}" has_url_scheme)
|
||||
qt_ir_parse_git_url(
|
||||
URL "${url_value}"
|
||||
OUT_VAR_HAS_URL_SCHEME has_url_scheme
|
||||
)
|
||||
if(NOT has_url_scheme)
|
||||
set(base_git_path "${parent_repo_base_git_path}/${url_value}")
|
||||
|
||||
# The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {}
|
||||
# That got rid of ../ and ../../ in the path, but it broke down
|
||||
# when more than two ../ were present.
|
||||
# We just use ABSOLUTE to resolve the path and get rid of all ../
|
||||
# Note the empty BASE_DIR is important, otherwise the path is relative to
|
||||
# ${CMAKE_CURRENT_SOURCE_DIR}.
|
||||
get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "")
|
||||
qt_ir_normalize_git_url("${base_git_path}" base_git_path)
|
||||
else()
|
||||
set(base_git_path "${url_value}")
|
||||
endif()
|
||||
|
||||
@@ -47,3 +47,20 @@ instructions:
|
||||
condition: property
|
||||
property: features
|
||||
contains_value: UseConfigure
|
||||
disable_if:
|
||||
condition: or
|
||||
conditions:
|
||||
- condition: property
|
||||
property: target.osVersion
|
||||
in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks]
|
||||
- condition: and
|
||||
conditions:
|
||||
- condition: property
|
||||
property: target.os
|
||||
equals_value: Windows
|
||||
- condition: property
|
||||
property: target.arch
|
||||
not_equals_property: host.arch
|
||||
- condition: property
|
||||
property: features
|
||||
not_contains_value: "DebianPackaging"
|
||||
|
||||
@@ -1,20 +1,10 @@
|
||||
Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'opensuse-15.5-host-asan'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
|
||||
Configure arguments: '-nomake examples -developer-build'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
|
||||
]
|
||||
-
|
||||
Id: 'opensuse-15.6-host-asan'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests']
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
|
||||
Configure arguments: '-nomake examples -developer-build'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
|
||||
@@ -30,13 +30,13 @@ Configurations:
|
||||
Id: 'ubuntu-22.04-developer-build-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly']
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'ubuntu-22.04-developer-build'
|
||||
-
|
||||
Id: 'ubuntu-22.04-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly']
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later
|
||||
-
|
||||
@@ -65,7 +65,7 @@ Configurations:
|
||||
Id: 'ubuntu-24.04-arm64-offscreen-tests'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'TestOnly']
|
||||
Features: ['TestOnly']
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'QT_QPA_OFFSCREEN_NO_GLX=1',
|
||||
@@ -99,30 +99,19 @@ Configurations:
|
||||
Id: 'ubuntu-24.04-x64-developer-build-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
|
||||
Platform dependency: 'ubuntu-24.04-x64-developer-build'
|
||||
-
|
||||
Id: 'ubuntu-24.04-x64-x11-tests'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['Sccache', 'TestOnly', 'InsignificantTests']
|
||||
Platform dependency: 'ubuntu-24.04-x64'
|
||||
-
|
||||
Id: 'opensuse-15.5-developer-build'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -developer-build'
|
||||
Environment variables: [
|
||||
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'
|
||||
]
|
||||
-
|
||||
Id: 'opensuse-15.6-developer-build'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests']
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -developer-build'
|
||||
Environment variables: [
|
||||
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
|
||||
@@ -131,7 +120,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'sles-15_sp5-static'
|
||||
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
|
||||
Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||
@@ -151,9 +140,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-10_22h2-msvc2022'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
|
||||
@@ -163,9 +152,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-msvc2022'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
||||
@@ -175,9 +164,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_22h2-arm64-msvc2022'
|
||||
Template: 'qtci-windows-11_22H2-aarch64-54'
|
||||
Template: 'qtci-windows-11_22H2-aarch64-55'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..',
|
||||
@@ -186,7 +175,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-msvc2022-arm64'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Target arch: 'arm64'
|
||||
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
@@ -202,9 +191,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-msvc2022-developer-build'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
|
||||
@@ -216,7 +205,7 @@ Configurations:
|
||||
Id: 'rhel-8.10'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
@@ -226,7 +215,7 @@ Configurations:
|
||||
Id: 'rhel-9.4'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
@@ -247,9 +236,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-10_22h2-mingw13'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Compiler: 'Mingw'
|
||||
Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
|
||||
@@ -260,9 +249,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-llvm'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'Clang'
|
||||
Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
|
||||
Environment variables: [
|
||||
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
||||
@@ -273,9 +262,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-mingw13-developer-build'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'Mingw'
|
||||
Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
|
||||
@@ -320,6 +309,6 @@ Configurations:
|
||||
Id: 'documentation-warnings'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
|
||||
Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2']
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ Configurations:
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
|
||||
Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
|
||||
@@ -24,7 +24,7 @@ Configurations:
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests']
|
||||
Features: ['Sccache', 'UseConfigure', 'InsignificantTests']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
|
||||
|
||||
@@ -8,7 +8,7 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['PinCores', 'Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
|
||||
@@ -8,7 +8,7 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'vxworks-imx6-buildtest'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
|
||||
Environment variables: [
|
||||
'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB',
|
||||
'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
|
||||
@@ -23,7 +23,7 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'vxworks-x86_64-buildtest'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly']
|
||||
Environment variables: [
|
||||
'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB',
|
||||
'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib',
|
||||
|
||||
@@ -3,7 +3,7 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'windows-11_23H2-msvc2022-minimal-static-test'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests']
|
||||
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
|
||||
@@ -15,7 +15,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test'
|
||||
Template: 'qtci-windows-11_22H2-aarch64-53'
|
||||
Template: 'qtci-windows-11_22H2-aarch64-55'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests']
|
||||
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql'
|
||||
@@ -53,9 +53,8 @@ Configurations:
|
||||
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests']
|
||||
Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
|
||||
]
|
||||
|
||||
-
|
||||
|
||||
@@ -2,9 +2,9 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'sles-15_sp5-minimal-static'
|
||||
Template: 'qtci-linux-SLES-15_SP5-x86_64-50'
|
||||
Template: 'qtci-linux-SLES-15_SP5-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
|
||||
@@ -20,9 +20,9 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_23H2-minimal-static'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
|
||||
@@ -34,5 +34,5 @@ Configurations:
|
||||
Id: 'macos-minimal-static'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework'
|
||||
|
||||
@@ -17,7 +17,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'android-armv7-on-windows'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'Mingw'
|
||||
@@ -39,7 +39,7 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
@@ -47,22 +47,6 @@ Configurations:
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_api_28'
|
||||
]
|
||||
-
|
||||
Id: 'android-14-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_64_api_34'
|
||||
]
|
||||
-
|
||||
Id: 'android-15-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
@@ -71,7 +55,7 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests']
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -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_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
|
||||
@@ -2,36 +2,25 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'webassembly-linux-thread-asyncify'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.5-developer-build'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
"TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
|
||||
-feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-linux-thread-asyncify-openSUSE-15.6'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.6-developer-build'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'UseConfigure']
|
||||
Features: ['DoNotRunTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
"TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \
|
||||
-DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\""
|
||||
-feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"",
|
||||
'HEADLESS_CHROME_FOR_TESTING=true'
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-windows'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'Mingw'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'windows-10_22h2-mingw13'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}',
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
@@ -41,24 +30,11 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-linux-thread'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.5-developer-build'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-linux-thread-openSUSE-15.6'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.6-developer-build'
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread',
|
||||
@@ -67,24 +43,11 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-linux-shared'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.5-developer-build'
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON'
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-linux-shared-openSUSE-15.6'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'opensuse-15.6-developer-build'
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
|
||||
'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared',
|
||||
|
||||
@@ -2,13 +2,13 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: "ios-tests-on-macos"
|
||||
Template: 'qtci-macos-13-x86_64-103'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Target os: 'IOS_ANY'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'Clang'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'macos-universal-on-x86_64'
|
||||
Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
|
||||
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang'
|
||||
]
|
||||
|
||||
@@ -10,10 +10,9 @@ Configurations:
|
||||
Platform dependency: [
|
||||
'rhel-8.10',
|
||||
'android-9-x86-on-linux',
|
||||
'android-14-x86_64-on-linux'
|
||||
'android-15-x86_64-on-linux'
|
||||
]
|
||||
Features: [
|
||||
'PinCores',
|
||||
'Sccache',
|
||||
'WarningsAreErrors',
|
||||
'AndroidTestRun',
|
||||
@@ -23,7 +22,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
|
||||
'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-14-x86_64-on-linux',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
|
||||
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
|
||||
'ANDROID_EMULATOR=emulator_x86_api_28'
|
||||
]
|
||||
|
||||
@@ -15,9 +15,8 @@ Configurations:
|
||||
Features: ['Packaging', 'Sccache', '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" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'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',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf'
|
||||
]
|
||||
|
||||
-
|
||||
@@ -29,7 +28,6 @@ Configurations:
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
|
||||
]
|
||||
|
||||
@@ -119,7 +117,6 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
|
||||
]
|
||||
-
|
||||
Id: 'macos-14-arm64-developer-build'
|
||||
@@ -129,7 +126,6 @@ Configurations:
|
||||
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
]
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@ Include: [
|
||||
Configurations:
|
||||
-
|
||||
Id: 'qnx-710-arm64-on-windows'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'MSVC2019'
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-11_23H2-msvc2022-unity-build'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-54'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
|
||||
Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
|
||||
@@ -53,6 +53,5 @@ Configurations:
|
||||
Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"',
|
||||
'Protobuf_ROOT=/usr/local/lib/cmake/protobuf',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON',
|
||||
]
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['DisableTests']
|
||||
-
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -15,7 +15,7 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-linux-Debian-11.6-aarch64-50'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-aarch64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -28,7 +28,7 @@ Configurations:
|
||||
Environment variables: []
|
||||
# without tests
|
||||
-
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
|
||||
Configure arguments: ''
|
||||
@@ -36,7 +36,7 @@ Configurations:
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
# oldest Qt version
|
||||
-
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-11_23H2-x86_64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
|
||||
@@ -15,9 +15,6 @@ Include: [
|
||||
Configurations: []
|
||||
Overrides:
|
||||
# Make VxWorks tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -10,7 +10,7 @@ Overrides:
|
||||
# Make VxWorks tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -14,7 +14,7 @@ Overrides:
|
||||
# Make VxWorks tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -6,8 +6,3 @@ Include: [
|
||||
address_sanitizer_platforms.yaml
|
||||
]
|
||||
Configurations: []
|
||||
Overrides:
|
||||
# Make VxWorks arm tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -6,8 +6,3 @@ Include: [
|
||||
address_sanitizer_platforms.yaml
|
||||
]
|
||||
Configurations: []
|
||||
Overrides:
|
||||
# Make VxWorks arm tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -11,4 +11,4 @@ Overrides:
|
||||
# Make VxWorks x86_64 tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -11,4 +11,4 @@ Overrides:
|
||||
# Make VxWorks x86_64 tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -8,7 +8,6 @@ Include: [
|
||||
cmake_platforms.yaml: [
|
||||
"ubuntu-22.04",
|
||||
"ubuntu-22.04-developer-build",
|
||||
"opensuse-15.5-developer-build",
|
||||
"opensuse-15.6-developer-build",
|
||||
"sles-15_sp5-static",
|
||||
"sles-15_sp6-static",
|
||||
|
||||
@@ -8,7 +8,6 @@ Include: [
|
||||
cmake_platforms.yaml: [
|
||||
"ubuntu-22.04",
|
||||
"ubuntu-22.04-developer-build",
|
||||
"opensuse-15.5-developer-build",
|
||||
"opensuse-15.6-developer-build",
|
||||
"sles-15_sp5-static",
|
||||
"sles-15_sp6-static",
|
||||
@@ -49,7 +48,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'Windows-MSVC2022_Static'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests']
|
||||
Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql'
|
||||
|
||||
@@ -10,7 +10,7 @@ Overrides:
|
||||
# Make VxWorks tests insignificant.
|
||||
-
|
||||
Id: 'vxworks-imx6-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
-
|
||||
Id: 'vxworks-x86_64-tests'
|
||||
Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests']
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10_22H2-x86_64-52'
|
||||
Template: 'qtci-windows-10_22H2-x86_64-53'
|
||||
Compiler: 'Mingw'
|
||||
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
|
||||
Features: ['Packaging', UseLegacyInstructions']
|
||||
|
||||
@@ -13,8 +13,9 @@ Include: [
|
||||
'android-arm64-on-macos',
|
||||
'android-armv7-on-windows',
|
||||
'android-9-x86-on-linux',
|
||||
'android-14-x86_64-on-linux'
|
||||
]
|
||||
'android-15-x86_64-on-linux'
|
||||
],
|
||||
offline_documentation.yaml
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
|
||||
@@ -2,15 +2,8 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'webassembly-linux-thread-asyncify-tests'
|
||||
Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Features: ['PinCores', 'Sccache', 'TestOnly']
|
||||
Platform dependency: 'webassembly-linux-thread-asyncify'
|
||||
-
|
||||
Id: 'webassembly-linux-thread-asyncify-tests-openSUSE-15.6'
|
||||
Template: 'qtci-linux-openSUSE-15.6-x86_64-51'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6'
|
||||
Platform dependency: 'webassembly-linux-thread-asyncify'
|
||||
|
||||
@@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0)
|
||||
Windows 10 SDK (10.0.22621.0)
|
||||
Windows Universal C Runtime
|
||||
|
||||
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
|
||||
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
|
||||
# COIN-1206
|
||||
|
||||
# NOTE! Work loads were added during installation!
|
||||
|
||||
############################################################
|
||||
|
||||
@@ -56,6 +56,10 @@ Windows 11 SDK (10.0.22000.0)
|
||||
Windows 11 SDK (10.0.22621.0)
|
||||
Windows Universal C Runtime
|
||||
|
||||
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
|
||||
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
|
||||
# COIN-1206
|
||||
|
||||
# NOTE! Work loads were added during installation!
|
||||
|
||||
############################################################
|
||||
|
||||
@@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0)
|
||||
Windows 11 SDK (10.0.22621.0)
|
||||
Windows Universal C Runtime
|
||||
|
||||
Windows SDK (10.0.26100.1742) was later downloaded and installed from:
|
||||
https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
|
||||
# COIN-1206
|
||||
|
||||
# NOTE! Work loads were added during installation!
|
||||
|
||||
############################################################
|
||||
|
||||
@@ -33,11 +33,6 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||
ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
|
||||
ndkSha1Default=$ndkSha1Latest
|
||||
|
||||
# Android 14 avd zip
|
||||
android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
|
||||
android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
|
||||
android14SystemPath="$basePath/$android14SystemZipName"
|
||||
|
||||
# Android Automotive max SDK level image
|
||||
sdkApiLevelAutomotiveMax="android-34"
|
||||
androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
|
||||
@@ -136,12 +131,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
|
||||
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
|
||||
echo "Download and unzip Android Emulator version 34.1.19"
|
||||
emulatorFileName="emulator-linux_x64-11525734.zip"
|
||||
echo "Download and unzip Android Emulator version 35.2.10"
|
||||
emulatorFileName="emulator-linux_x64-12414864.zip"
|
||||
emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
|
||||
emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
|
||||
emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
|
||||
emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
|
||||
emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10"
|
||||
DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
|
||||
echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
|
||||
sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
|
||||
@@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination"
|
||||
sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
|
||||
rm "$minVersionFilePath"
|
||||
|
||||
echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
echo "Download and unzip Android 15 System Image"
|
||||
maxVersionFileName="x86_64-35_r08.zip"
|
||||
maxVersionDestination="$sdkTargetFolder/system-images/android-35/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"
|
||||
|
||||
echo "Extract stored Android 14 Beta $android14SystemZipName"
|
||||
DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
|
||||
"/tmp/$android14SystemZipName"
|
||||
sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
|
||||
mkdir -p "$maxVersionDestination"
|
||||
DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
|
||||
|
||||
echo "Unzipping the Android 15 to $maxVersionDestination"
|
||||
sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
|
||||
rm "$maxVersionFilePath"
|
||||
|
||||
echo "Checking the contents of Android SDK again..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
@@ -176,9 +178,6 @@ 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_34 -c 2048M -f \
|
||||
-k "system-images;android-34;google_apis;x86_64"
|
||||
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
|
||||
-k "system-images;android-35;google_apis;x86_64"
|
||||
|
||||
|
||||
@@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
majorminorversion="3.16"
|
||||
version="3.16.8"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz"
|
||||
SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c"
|
||||
majorminorversion="3.22"
|
||||
version="3.22.6"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
|
||||
SHA1="4a5ba17568d108d295719850dd584e775583f61b"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-Linux-x86_64"
|
||||
appPrefix="cmake-$version-linux-x86_64"
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
|
||||
25
coin/provisioning/common/macos/install-simulator-runtime.sh
Executable file
25
coin/provisioning/common/macos/install-simulator-runtime.sh
Executable file
@@ -0,0 +1,25 @@
|
||||
#!/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
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
set -ex
|
||||
|
||||
function InstallSimulatorRuntime {
|
||||
url=$1
|
||||
url_alt=$2
|
||||
expectedSha1=$3
|
||||
packageName=$4
|
||||
version=$5
|
||||
|
||||
DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName"
|
||||
echo "Installing"
|
||||
# macOS 14 / Xcode 15 has a different install command
|
||||
if [[ $OSTYPE == "darwin23" ]]; then
|
||||
xcrun simctl runtime add "/tmp/$packageName"
|
||||
else
|
||||
xcodebuild -importPlatform "/tmp/$packageName"
|
||||
fi
|
||||
|
||||
echo "Simulator Runtime = $version" >> ~/versions.txt
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2018 The Qt Company Ltd.
|
||||
# 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
|
||||
|
||||
# Install libiodbc
|
||||
@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@"
|
||||
|
||||
# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc
|
||||
|
||||
read -r -a arr <<< "$(brew list --versions libiodbc)"
|
||||
version=${arr[1]}
|
||||
|
||||
SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
|
||||
SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
|
||||
SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)"
|
||||
|
||||
echo "libiodbc = $version" >> ~/versions.txt
|
||||
|
||||
@@ -37,5 +37,5 @@ umount "$mountpoint"
|
||||
echo "Removing $packageName"
|
||||
rm "/tmp/$packageName"
|
||||
|
||||
SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin"
|
||||
SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion"
|
||||
echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt
|
||||
|
||||
@@ -8,21 +8,21 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
|
||||
version="3.1.56"
|
||||
version="3.1.70"
|
||||
versionNode="v16.20.0"
|
||||
tarBallVersion="${version//./_}"
|
||||
if uname -a |grep -q Darwin; then
|
||||
if uname -a | grep -q Darwin; then
|
||||
tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
|
||||
sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84"
|
||||
sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf"
|
||||
else
|
||||
tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
|
||||
sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5"
|
||||
sha="047a3da9048edc71fb56af544c4bb2448d6c0644"
|
||||
fi
|
||||
cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
|
||||
target="/tmp/${tarBallPackage}"
|
||||
|
||||
mkdir -p /opt
|
||||
cd /opt
|
||||
cd /opt || exit
|
||||
echo "URL: $cacheUrl"
|
||||
|
||||
if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
|
||||
@@ -31,13 +31,16 @@ if DownloadURL "$cacheUrl" "" "$sha" "$target"; then
|
||||
else
|
||||
echo "Emsdk isn't cached. Cloning it"
|
||||
sudo git clone https://github.com/emscripten-core/emsdk.git
|
||||
cd emsdk
|
||||
sudo ./emsdk install "$version"
|
||||
cd emsdk || exit
|
||||
if ! sudo ./emsdk install "$version"; then
|
||||
echo "Error: emsdk installation failed"
|
||||
exit 1
|
||||
fi
|
||||
sudo ./emsdk activate "$version"
|
||||
fi
|
||||
|
||||
# platform-specific toolchain and node binaries. urls obtained from "emsdk install"
|
||||
if uname -a |grep -q Darwin; then
|
||||
if uname -a | grep -q Darwin; then
|
||||
pathNodeExecutable="node-$versionNode-darwin-x64/bin/node"
|
||||
else
|
||||
pathNodeExecutable="node-$versionNode-linux-x64/bin/node"
|
||||
|
||||
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n7.0.2"
|
||||
version="n7.1"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
|
||||
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
||||
@@ -10,9 +10,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n7.0.2"
|
||||
version="n7.1"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
|
||||
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
@@ -28,48 +28,49 @@ fi
|
||||
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt")
|
||||
|
||||
build_ffmpeg_ios() {
|
||||
local target_arch=$1
|
||||
local target_platform=$1
|
||||
if [ "$target_platform" == "arm64-simulator" ]; then
|
||||
target_sdk="iphonesimulator"
|
||||
target_platform="arm64"
|
||||
minos="-mios-simulator-version-min=16.0"
|
||||
else
|
||||
target_sdk="iphoneos"
|
||||
target_platform="arm64"
|
||||
minos="-miphoneos-version-min=16.0"
|
||||
# TODO: consider non-arm simulator?
|
||||
fi
|
||||
|
||||
if [ "$target_arch" == "x86_64" ]; then
|
||||
target_sdk="iphonesimulator"
|
||||
target_arch="x86_64"
|
||||
minos="-mios-simulator-version-min=13.0"
|
||||
else
|
||||
target_sdk="iphoneos"
|
||||
target_arch="arm64"
|
||||
minos="-miphoneos-version-min=13.0"
|
||||
fi
|
||||
# Note: unlike similar install-ffmpeg scripts, not $target_platform,
|
||||
# but $1 (which can be arm64-simulator with arm64 target_platform).
|
||||
local build_dir="$ffmpeg_source_dir/build_ios/$1"
|
||||
sudo mkdir -p "$build_dir"
|
||||
pushd "$build_dir"
|
||||
|
||||
local build_dir="$ffmpeg_source_dir/build_ios/$target_arch"
|
||||
sudo mkdir -p "$build_dir"
|
||||
pushd "$build_dir"
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
|
||||
# shellcheck disable=SC2086
|
||||
sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \
|
||||
--sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \
|
||||
--enable-cross-compile \
|
||||
--enable-optimizations \
|
||||
--prefix=$prefix \
|
||||
--arch=$target_arch \
|
||||
--cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \
|
||||
--cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \
|
||||
--ar="$(xcrun --sdk ${target_sdk} --find ar)" \
|
||||
--ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
|
||||
--strip="$(xcrun --sdk ${target_sdk} --find strip)" \
|
||||
--nm="$(xcrun --sdk ${target_sdk} --find nm)" \
|
||||
--target-os=darwin \
|
||||
--extra-cflags="$minos" \
|
||||
--extra-cxxflags="$minos" \
|
||||
--enable-cross-compile \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--install-name-dir='@rpath/Frameworks' \
|
||||
--enable-swscale \
|
||||
--enable-pthreads \
|
||||
--disable-audiotoolbox
|
||||
--enable-cross-compile \
|
||||
--enable-optimizations \
|
||||
--prefix=$prefix \
|
||||
--arch=$target_platform \
|
||||
--cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \
|
||||
--cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \
|
||||
--ar="$(xcrun --sdk ${target_sdk} --find ar)" \
|
||||
--ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \
|
||||
--strip="$(xcrun --sdk ${target_sdk} --find strip)" \
|
||||
--nm="$(xcrun --sdk ${target_sdk} --find nm)" \
|
||||
--target-os=darwin \
|
||||
--extra-ldflags="$minos" \
|
||||
--enable-cross-compile \
|
||||
--enable-shared \
|
||||
--disable-static \
|
||||
--install-name-dir='@rpath' \
|
||||
--enable-swscale \
|
||||
--enable-pthreads \
|
||||
--disable-audiotoolbox
|
||||
|
||||
sudo make install DESTDIR="$build_dir/installed" -j
|
||||
popd
|
||||
sudo make install DESTDIR="$build_dir/installed" -j4
|
||||
popd
|
||||
}
|
||||
|
||||
install_ffmpeg() {
|
||||
@@ -98,11 +99,106 @@ install_ffmpeg() {
|
||||
popd >/dev/null
|
||||
done
|
||||
sudo cp -r $1$prefix/include $prefix
|
||||
echo "LS done."
|
||||
}
|
||||
|
||||
build_ffmpeg_ios "x86_64"
|
||||
build_info_plist() {
|
||||
local file_path="$1"
|
||||
local framework_name="$2"
|
||||
local framework_id="$3"
|
||||
|
||||
local minimum_version_key="MinimumOSVersion"
|
||||
local minimum_os_version="16.0"
|
||||
local supported_platforms="iPhoneOS"
|
||||
|
||||
info_plist="<?xml version=\"1.0\" encoding=\"UTF-8\"?>
|
||||
<!DOCTYPE plist PUBLIC \"-//Apple//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
|
||||
<plist version=\"1.0\">
|
||||
<dict>
|
||||
<key>CFBundleDevelopmentRegion</key>
|
||||
<string>en</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>${framework_name}</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>${framework_id}</string>
|
||||
<key>CFBundleInfoDictionaryVersion</key>
|
||||
<string>6.0</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>${framework_name}</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>FMWK</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>7.0.2</string>
|
||||
<key>CFBundleVersion</key>
|
||||
<string>7.0.2</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>${minimum_version_key}</key>
|
||||
<string>${minimum_os_version}</string>
|
||||
<key>CFBundleSupportedPlatforms</key>
|
||||
<array>
|
||||
<string>${supported_platforms}</string>
|
||||
</array>
|
||||
<key>NSPrincipalClass</key>
|
||||
<string></string>
|
||||
</dict>
|
||||
</plist>"
|
||||
echo $info_plist | sudo tee ${file_path} 1>/dev/null
|
||||
}
|
||||
|
||||
create_framework() {
|
||||
# Create a 'traditional' framework from the corresponding dylib.
|
||||
local framework_name="$1"
|
||||
local platform="$2" # For now it's either arm64 or arm64-simulator, see below.
|
||||
local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg"
|
||||
local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
|
||||
|
||||
sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework"
|
||||
sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}"
|
||||
|
||||
# Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib
|
||||
sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}"
|
||||
|
||||
build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name}
|
||||
|
||||
# Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above:
|
||||
otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do
|
||||
found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*})
|
||||
if [ "$found_name" != "$framework_name" ]
|
||||
then
|
||||
sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}"
|
||||
fi
|
||||
done
|
||||
#sudo mkdir -p "$prefix/framework/"
|
||||
#sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/"
|
||||
}
|
||||
|
||||
create_xcframework() {
|
||||
# Create 'traditional' framework from the corresponding dylib,
|
||||
# also creating
|
||||
local framework_name="$1"
|
||||
|
||||
local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
|
||||
local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework"
|
||||
|
||||
sudo mkdir -p "$prefix/framework/"
|
||||
sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework"
|
||||
}
|
||||
|
||||
build_ffmpeg_ios "arm64-simulator"
|
||||
build_ffmpeg_ios "arm64"
|
||||
|
||||
install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed"
|
||||
ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale"
|
||||
|
||||
for name in $ffmpeg_libs; do
|
||||
create_framework $name "arm64"
|
||||
create_framework $name "arm64-simulator"
|
||||
done
|
||||
|
||||
# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks:
|
||||
for name in $ffmpeg_libs; do
|
||||
create_xcframework $name
|
||||
done
|
||||
|
||||
install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed"
|
||||
|
||||
SetEnvVar "FFMPEG_DIR_IOS" $prefix
|
||||
|
||||
@@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n7.0.2"
|
||||
version="n7.1"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
|
||||
sha1="f008a93710a7577e3f85a90f4b632cc615164712"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
||||
@@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \
|
||||
ninja all:all
|
||||
sudo env "PATH=$PATH" ninja install:all
|
||||
|
||||
SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf"
|
||||
|
||||
# Refresh shared library cache if OS isn't macOS
|
||||
if uname -a |grep -qv "Darwin"; then
|
||||
sudo ldconfig
|
||||
|
||||
@@ -11,8 +11,8 @@ set -ex
|
||||
# This script will fetch and extract pre-buildt squish package for Linux and Mac.
|
||||
# Squish is need by Release Test Automation (RTA)
|
||||
|
||||
version="8.0.0"
|
||||
qtBranch="67x"
|
||||
version="8.1.0"
|
||||
qtBranch="68x"
|
||||
installFolder="/opt"
|
||||
squishFolder="$installFolder/squish"
|
||||
preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable"
|
||||
@@ -24,14 +24,14 @@ testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squi
|
||||
testSuiteLocal="/tmp/squish_test_suite"
|
||||
if uname -a |grep -q Darwin; then
|
||||
compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz"
|
||||
sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a"
|
||||
sha1="03a0c713d0d328667df2e7804f2e4d507707b849"
|
||||
else
|
||||
if [ "$PROVISIONING_ARCH" = arm64 ] ; then
|
||||
compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz"
|
||||
sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5"
|
||||
sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c"
|
||||
else
|
||||
compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz"
|
||||
sha1="db5c48f359b46a460551cdf9362c63f557cbc04f"
|
||||
sha1="b798417ddf4b668306cb90d551df906828644152"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -5,14 +5,15 @@
|
||||
|
||||
# This script will install emscripten needed by WebAssembly
|
||||
|
||||
$version = "3.1.56"
|
||||
$version = "3.1.70"
|
||||
$zipVersion = $version -replace '\.', "_"
|
||||
$temp = "$env:tmp"
|
||||
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
|
||||
$sha = "ab376d218f1a66302c36770977948f74f0576a42"
|
||||
$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27"
|
||||
|
||||
# Make sure python is in the path
|
||||
Prepend-Path "C:\Python27"
|
||||
# Python used for '.\emsdk install'
|
||||
$pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine")
|
||||
Prepend-Path $pythonPath
|
||||
|
||||
cd "C:\\Utils"
|
||||
$installLocationEmsdk = "C:\\Utils\\emsdk"
|
||||
@@ -24,11 +25,18 @@ try {
|
||||
cd $installLocationEmsdk
|
||||
.\emsdk activate $version
|
||||
} catch {
|
||||
Write-Host "Can't find cached emsdk. Cloning it"
|
||||
Write-Host "Can't find cached emsdk or another error occurred. Cloning it"
|
||||
Write-Host "Error details: $_"
|
||||
|
||||
C:\PROGRA~1\Git\bin\git clone https://github.com/emscripten-core/emsdk.git
|
||||
cd $installLocationEmsdk
|
||||
.\emsdk install $version
|
||||
.\emsdk activate $version
|
||||
|
||||
try {
|
||||
.\emsdk install $version
|
||||
.\emsdk activate $version
|
||||
} catch {
|
||||
throw "emsdk installation failed: $_"
|
||||
}
|
||||
}
|
||||
|
||||
$versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1]
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
# This script will install FFmpeg
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
|
||||
$version="n7.0.2"
|
||||
$version="n7.1"
|
||||
$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0"
|
||||
$sha1="f008a93710a7577e3f85a90f4b632cc615164712"
|
||||
$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
$ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
||||
@@ -5,24 +5,24 @@
|
||||
|
||||
# This script installs 7-Zip
|
||||
|
||||
$version = "23.01"
|
||||
$nonDottedVersion = "2301"
|
||||
$version = "24.09"
|
||||
$nonDottedVersion = "2409"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$arch = "-arm64"
|
||||
$sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7"
|
||||
$sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$arch = "-x64"
|
||||
$sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB"
|
||||
$sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0"
|
||||
Break
|
||||
}
|
||||
x86 {
|
||||
$arch = ""
|
||||
$sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C"
|
||||
$sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497"
|
||||
Break
|
||||
}
|
||||
default {
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
# This script will pre-installed squish package for Windows.
|
||||
# Squish is need by Release Test Automation (RTA)
|
||||
|
||||
$version = "8.0.0"
|
||||
$qtBranch = "67x"
|
||||
$version = "8.1.0"
|
||||
$qtBranch = "68x"
|
||||
$targetDir = "C:\Utils\squish"
|
||||
$squishPackage = "C:\Utils\rta_squish"
|
||||
$squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable"
|
||||
@@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro
|
||||
# In Windows 11 case $OSVersion is 'Windows 10 Pro'
|
||||
$winVersion = "win10"
|
||||
if (Is64BitWinHost) {
|
||||
$sha1 = "0f863c261f854ec38032815298f5636e99779bff"
|
||||
$sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b"
|
||||
}
|
||||
} else {
|
||||
$winVersion = "n/a"
|
||||
|
||||
@@ -4,3 +4,6 @@ Write-Host '*****************************************************'
|
||||
Write-Host '******************** Get-PSDrive ********************'
|
||||
Get-PSDrive
|
||||
Write-Host '*****************************************************'
|
||||
Write-Host '******************** Path Content *******************'
|
||||
$env:Path -split ';'
|
||||
Write-Host '*****************************************************'
|
||||
|
||||
@@ -6,13 +6,36 @@
|
||||
# This script will install Vulkan SDK
|
||||
# Original Download page: https://vulkan.lunarg.com/sdk/home#windows
|
||||
|
||||
$version = "1.2.182.0"
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
Write-Host "Installing $cpu_arch Vulkan SDK"
|
||||
$version = "1.2.182.0" # TODO: Update to newest 1.3.296.0
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$version = "1.3.296.0"
|
||||
$externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe"
|
||||
$sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02"
|
||||
$installArgs = "--accept-licenses --default-answer --confirm-command install"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe"
|
||||
$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
|
||||
$installArgs = "/S"
|
||||
Break
|
||||
}
|
||||
default {
|
||||
throw "Unknown architecture $cpu_arch"
|
||||
}
|
||||
}
|
||||
|
||||
$vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
|
||||
$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
|
||||
Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage
|
||||
|
||||
Download "$externalUrl" "$internalUrl" "$vulkanPackage"
|
||||
Verify-Checksum "$vulkanPackage" "$sha1"
|
||||
|
||||
Run-Executable $vulkanPackage "/S"
|
||||
Run-Executable "$vulkanPackage" "$installArgs"
|
||||
|
||||
Write-Host "Cleaning $vulkanPackage.."
|
||||
Remove "$vulkanPackage"
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 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
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/squishInstall.sh"
|
||||
|
||||
@@ -86,7 +86,6 @@ installPackages+=(libXtst-devel)
|
||||
installPackages+=(libxshmfence-devel)
|
||||
installPackages+=(nspr-devel)
|
||||
installPackages+=(nss-devel)
|
||||
installPackages+=(python3-html5lib)
|
||||
installPackages+=(libatomic)
|
||||
installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64)
|
||||
# For Android builds
|
||||
@@ -154,6 +153,8 @@ installPackages+=(zip)
|
||||
installPackages+=(perl-IPC-Cmd)
|
||||
# password management support for Qt Creator
|
||||
installPackages+=(libsecret-devel)
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
installPackages+=(perl-JSON)
|
||||
|
||||
sudo yum -y install "${installPackages[@]}"
|
||||
|
||||
@@ -167,7 +168,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py
|
||||
sudo pip config --user set global.extra-index-url https://pypi.org/simple/
|
||||
|
||||
sudo pip3 install virtualenv wheel
|
||||
sudo python3.11 -m pip install virtualenv wheel
|
||||
sudo python3.11 -m pip install virtualenv wheel html5lib
|
||||
sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt"
|
||||
# For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the
|
||||
# system python3.11.
|
||||
|
||||
@@ -167,6 +167,8 @@ installPackages+=(perl-IPC-Cmd)
|
||||
installPackages+=(libsecret-devel)
|
||||
# For Firebird in RTA
|
||||
installPackages+=(libtommath-devel)
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
installPackages+=(perl-JSON)
|
||||
|
||||
sudo yum -y install "${installPackages[@]}"
|
||||
|
||||
|
||||
@@ -110,6 +110,9 @@ sudo zypper -nq install cifs-utils
|
||||
# For Firebird in RTA
|
||||
sudo zypper -nq install libtommath-devel
|
||||
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
sudo zypper -nq install perl-JSON
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
|
||||
@@ -113,6 +113,9 @@ sudo zypper -nq install cifs-utils
|
||||
# For Firebird in RTA
|
||||
sudo zypper -nq install libtommath-devel
|
||||
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
sudo zypper -nq install perl-JSON
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
|
||||
@@ -242,6 +242,8 @@ installPackages+=(patchelf)
|
||||
|
||||
# For Firebird in RTA
|
||||
installPackages+=(libtommath-dev)
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
installPackages+=(libjson-perl)
|
||||
|
||||
echo "Running update for apt"
|
||||
waitLoop
|
||||
|
||||
@@ -22,18 +22,18 @@ DownloadAndExtract () {
|
||||
|
||||
|
||||
# Axivion Bauhaus Suite
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
|
||||
targetFile="bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz"
|
||||
sha1="519f84237a4f55700dfb34767ba5bb342f142012"
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
|
||||
targetFile="bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz"
|
||||
sha1="43d18d55087ce02009b850553405af55ba4e37e2"
|
||||
cd "$HOME"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME"
|
||||
|
||||
mkdir "$HOME/.bauhaus"
|
||||
cd "$HOME/.bauhaus"
|
||||
wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_QSR_INTERN_20250118.key
|
||||
wget http://ci-files01-hki.ci.qt.io/input/axivion/QT_11427439_2025-10-07.key
|
||||
cd "$HOME"
|
||||
|
||||
#Axivion configuration
|
||||
cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/" "$HOME/"
|
||||
|
||||
echo "Axivion Bauhaus Suite = 7.8.4" >> ~/versions.txt
|
||||
echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt
|
||||
|
||||
@@ -87,6 +87,9 @@ sudo zypper -nq install libtommath-devel
|
||||
# Java
|
||||
sudo zypper -nq install java-17-openjdk
|
||||
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
sudo zypper -nq install perl-JSON
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
|
||||
@@ -10,14 +10,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
# shellcheck source=../common/unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
|
||||
chromeVersion="chrome-for-testing-115"
|
||||
sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e"
|
||||
chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.tar.gz"
|
||||
target="/tmp/chrome-for-testing-115.tar.gz"
|
||||
chromeVersion="chrome-for-testing-131"
|
||||
sha="006d8e0438980d5ca8809af6f036e2b802b13cc8"
|
||||
cachedChromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/${chromeVersion}.zip"
|
||||
officialChromeUrl="https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.204/linux64/chrome-linux64.zip"
|
||||
target="/tmp/${chromeVersion}.zip"
|
||||
|
||||
DownloadURL "$chromeUrl" "" "$sha" "$target"
|
||||
sudo tar -xzf "$target" -C "${HOME}"
|
||||
DownloadURL "$cachedChromeUrl" "$officialChromeUrl" "$sha" "$target"
|
||||
sudo unzip -q "$target" -d "${HOME}"
|
||||
sudo rm -f "$target"
|
||||
|
||||
SetEnvVar "BROWSER_FOR_WASM" "${HOME}/${chromeVersion}/chrome"
|
||||
SetEnvVar "CHROMEDRIVER_PATH" "${HOME}/${chromeVersion}/chromedriver"
|
||||
chromePath="${HOME}/chrome-linux64/chrome"
|
||||
SetEnvVar "BROWSER_FOR_WASM" "${chromePath}"
|
||||
|
||||
@@ -22,5 +22,5 @@ appPrefix=""
|
||||
|
||||
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
|
||||
|
||||
SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin"
|
||||
SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/9.6"
|
||||
echo "PostgreSQL = $psqlVersion" >> ~/versions.txt
|
||||
|
||||
14
coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh
Executable file
14
coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/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
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install-simulator-runtime.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
|
||||
version="17.4"
|
||||
packageName=iOS_"$version"_Simulator_Runtime.dmg
|
||||
url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
|
||||
sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
|
||||
|
||||
InstallSimulatorRuntime $url $url $sha1 $packageName $version
|
||||
14
coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh
Executable file
14
coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/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
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install-simulator-runtime.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
|
||||
version="17.4"
|
||||
packageName=iOS_"$version"_Simulator_Runtime.dmg
|
||||
url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
|
||||
sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50"
|
||||
|
||||
InstallSimulatorRuntime $url $url $sha1 $packageName $version
|
||||
@@ -5,3 +5,8 @@
|
||||
set -ex
|
||||
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false"
|
||||
|
||||
14
coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh
Executable file
14
coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/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
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install-simulator-runtime.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
|
||||
version="18.0"
|
||||
packageName=iOS_"$version"_Simulator_Runtime.dmg
|
||||
url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
|
||||
sha1="f29778313459b3a2a497ffd711b9dfa212241183"
|
||||
|
||||
InstallSimulatorRuntime $url $url $sha1 $packageName $version
|
||||
@@ -5,3 +5,8 @@
|
||||
set -ex
|
||||
|
||||
defaults write com.apple.CrashReporter DialogType server
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false"
|
||||
|
||||
14
coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh
Executable file
14
coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh
Executable file
@@ -0,0 +1,14 @@
|
||||
#!/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
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install-simulator-runtime.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh"
|
||||
version="18.0"
|
||||
packageName=iOS_"$version"_Simulator_Runtime.dmg
|
||||
url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName"
|
||||
sha1="f29778313459b3a2a497ffd711b9dfa212241183"
|
||||
|
||||
InstallSimulatorRuntime $url $url $sha1 $packageName $version
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 219dd44a26...ac8a0f891a
Submodule qt5compat updated: 9e0fc26d8e...db733a992e
Submodule qtactiveqt updated: bea80dcdbc...432ab8dea8
2
qtbase
2
qtbase
Submodule qtbase updated: 9cb0d48aae...22f33e1bd2
2
qtcharts
2
qtcharts
Submodule qtcharts updated: f4aa9dffcf...90fe26d9eb
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 24c6d91881...3af6bfeb03
Submodule qtconnectivity updated: d401180fc4...8028ed2bf3
Submodule qtdatavis3d updated: 3e7d0a477a...6ee3dd2b49
Submodule qtdeclarative updated: f5673f1e0e...2757053ded
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 7d49bbdf12...c3acff86cc
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 59085abc65...aefe80c95d
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: bfd24967bc...286ef19151
Submodule qthttpserver updated: 45c60e30e0...7316ebf24c
Submodule qtimageformats updated: 08d1bb4749...ac7f9af537
Submodule qtlanguageserver updated: 5f998f06eb...0ed776dd41
Submodule qtlocation updated: ea636dd72f...9b2de27789
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 0fd4a8f813...698dd95f2d
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: aeac9f7e17...2310f368fb
Submodule qtmultimedia updated: f68eef36f2...fdf40af34b
Submodule qtnetworkauth updated: 2f263f7028...b2f0d40bf1
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 7055c65fc1...df46e6c3c9
Submodule qtpositioning updated: 7db6885dce...db11ce3ac2
Submodule qtquick3d updated: 575612ae6b...94139eafc4
Submodule qtquick3dphysics updated: 85f5ad2048...511f591a6e
Submodule qtquickeffectmaker updated: e1847e589a...6e319e82c0
Submodule qtquicktimeline updated: 9e0a9979f2...8661e5daaf
Submodule qtremoteobjects updated: 392a215a2a...596ad5d608
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 253845885a...825e012f4c
Submodule qtsensors updated: 9a2f543f52...8190b6d330
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user