Compare commits

..

14 Commits
6.7.3 ... 6.7.1

Author SHA1 Message Date
Qt Submodule Update Bot
6977d02f6d Update submodules on '6.7.1 in qt/qt5'
Change-Id: Ib3aec689a4b2f1f1d8274465692bf6caac59bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-16 03:36:27 +00:00
Qt Submodule Update Bot
23d2984772 Update submodules on '6.7.1 in qt/qt5'
Change-Id: I5c24ef15417aa1d5f50fe2d4415df621a71949d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-14 15:00:01 +00:00
Qt Submodule Update Bot
c4108cf03e Update submodules on '6.7.1 in qt/qt5'
Change-Id: Icc835c21992e94c1f6b4f2a2a06c79593e770c05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-09 07:33:18 +00:00
Qt Submodule Update Bot
cca1757c94 Update submodules on '6.7.1 in qt/qt5'
Change-Id: Ie6dcf4948d635df31e98ad7b06d41818630a265a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-05 08:36:08 +00:00
Qt Submodule Update Bot
2dec77649e Update submodules on '6.7.1 in qt/qt5'
Change-Id: Id4ef674b0969e24d352e0085ede7a0358351ca1e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-05-01 10:27:15 +00:00
Joerg Bornemann
3a73873796 CI: Turn off FEATURE_clangcpp for MSVC2022
This feature turns off clang-support for lupdate.

Task-number: QTBUG-123611
Task-number: QTQAINFRA-6244
Change-Id: I192b711b6a310e3dd1da3fefe2ca0c8fb732a01c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
(cherry picked from commit c8a236e858)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 419dac87ec)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2024-04-30 08:56:40 +00:00
Elias Toivola
1e87deab06 Make Windows 11 23H2 targets blocking
This change removes 'InsignificantTests' feature from Windows 11 23H2
platform configurations.

Also add 'Packaging' to windows-11_23H2-msvc2022 target

Task-number: QTQAINFRA-6244
Task-number: QTQAINFRA-6075
Task-number: QTBUG-124244
Change-Id: I8ddb9dfa45199982511f46841d1be30757055b25
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit dc919e14d8)
(cherry picked from commit 2d591bf518)
2024-04-30 08:56:38 +00:00
Elias Toivola
b9bad8c373 Add Windows 11 23H2 as non-blocking in CI
Windows 11 23H2 version which will replace Windows 11 22H2 once the
new version is deemed as stable. Until then, 23h2 tests will be set
as insignificant.

Task-number: QTQAINFRA-6075
Task-number: QTQAINFRA-6244
Change-Id: I15054813896210fadf14da815ad5a7b3e402e800
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 5157d1ef93)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 59cb56a8b5)
2024-04-30 08:56:37 +00:00
Qt Submodule Update Bot
8982a79885 Update submodules on '6.7.1 in qt/qt5'
Change-Id: I0436d4d29a00b981fa451b82e2b7cddc29f5e166
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-30 08:56:36 +00:00
Simo Fält
7585f2d29d Provisioning: Fix openssl lib path on Debian
This amends change Ia4bacf1b7751e15915fc7faca473cb0408a72e35.

Task-number: QTBUG-123049
Change-Id: I0a3e24dd8157fd63c1bdfb06019faff2fa5ef3df
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 2ac1bddea4)
2024-04-29 14:55:27 +00:00
Simo Fält
d68c0b5ab6 Provisioning: Install openssl3 into Debian VM
Task-number: QTBUG-123049
Change-Id: Ia4bacf1b7751e15915fc7faca473cb0408a72e35
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 67e95f4591)
2024-04-29 14:55:24 +00:00
Qt Submodule Update Bot
434130173d Update submodules on '6.7.1 in qt/qt5'
Change-Id: Id08433195f7ff7f76936b9c12f45977cbebe93d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-29 00:32:37 +00:00
Qt Submodule Update Bot
79db950e99 Update submodules on '6.7.1 in qt/qt5'
Change-Id: I7c5f86fc0fd6def53caab4141ce72222aeb44cdc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-04-25 11:14:32 +00:00
Jani Heikkinen
971bbb8f2e Adjust submodule branches
Change-Id: Ica341236070c13aa3b4a3fd78d6ab3577c019590
2024-04-24 05:41:31 +01:00
110 changed files with 892 additions and 374 deletions

View File

@@ -10,13 +10,10 @@
# ==[ Footers: Uncomment and edit where applicable ]===================| # ==[ Footers: Uncomment and edit where applicable ]===================|
# #
# One task per entry. Add a space after the colon. # One task per entry. Add a space after the colon.
# Use Fixes to automatically close an issue, Reopens to automatically # Use Fixes to automatically close an issue, and Task-number to
# reopen an issue, and Task-number to reference it without further # reference it without further action.
# action. # You do not need both for the same issue.
# You do not need to include Task-Number where Fixes or Reopens is
# specified for the same issue.
#Fixes: #Fixes:
#Reopens:
#Task-number: #Task-number:
#Coverity-Id: #Coverity-Id:
# #

84
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 6.7.3 branch = 6.7.1
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 6.7.3 branch = 6.7.1
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase qtshadertools depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d recommends = qtdeclarative qtquick3d
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 6.7.3 branch = 6.7.1
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 6.7.3 branch = 6.7.1
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qtwebengine recommends = qtmultimedia qtshadertools qtwebengine
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 6.7.3 branch = 6.7.1
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 6.7.3 branch = 6.7.1
status = preview status = preview
[submodule "qtpositioning"] [submodule "qtpositioning"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtserialport recommends = qtdeclarative qtserialport
path = qtpositioning path = qtpositioning
url = ../qtpositioning.git url = ../qtpositioning.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtshadertools qtmultimedia recommends = qtdeclarative qtshadertools qtmultimedia
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtbase depends = qtbase
recommends = qtserialport recommends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning recommends = qtwebchannel qttools qtpositioning
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia recommends = qtmultimedia
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase qtmultimedia depends = qtbase qtmultimedia
recommends = qtdeclarative recommends = qtdeclarative
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
@@ -252,87 +252,87 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtquick3d"] [submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline recommends = qtquicktimeline
path = qtquick3d path = qtquick3d
url = ../qtquick3d.git url = ../qtquick3d.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qt5compat"] [submodule "qt5compat"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qt5compat path = qt5compat
url = ../qt5compat.git url = ../qt5compat.git
branch = 6.7.3 branch = 6.7.1
status = deprecated status = deprecated
[submodule "qtcoap"] [submodule "qtcoap"]
depends = qtbase depends = qtbase
path = qtcoap path = qtcoap
url = ../qtcoap.git url = ../qtcoap.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtmqtt"] [submodule "qtmqtt"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtmqtt path = qtmqtt
url = ../qtmqtt.git url = ../qtmqtt.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtopcua"] [submodule "qtopcua"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtopcua path = qtopcua
url = ../qtopcua.git url = ../qtopcua.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtlanguageserver"] [submodule "qtlanguageserver"]
depends = qtbase depends = qtbase
path = qtlanguageserver path = qtlanguageserver
url = ../qtlanguageserver.git url = ../qtlanguageserver.git
branch = 6.7.3 branch = 6.7.1
status = preview status = preview
[submodule "qthttpserver"] [submodule "qthttpserver"]
depends = qtbase depends = qtbase
recommends = qtwebsockets recommends = qtwebsockets
path = qthttpserver path = qthttpserver
url = ../qthttpserver.git url = ../qthttpserver.git
branch = 6.7.3 branch = 6.7.1
status = preview status = preview
[submodule "qtquick3dphysics"] [submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics path = qtquick3dphysics
url = ../qtquick3dphysics.git url = ../qtquick3dphysics.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtgrpc"] [submodule "qtgrpc"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgrpc path = qtgrpc
url = ../qtgrpc.git url = ../qtgrpc.git
branch = 6.7.3 branch = 6.7.1
status = preview status = preview
[submodule "qtquickeffectmaker"] [submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d recommends = qtquick3d
path = qtquickeffectmaker path = qtquickeffectmaker
url = ../qtquickeffectmaker.git url = ../qtquickeffectmaker.git
branch = 6.7.3 branch = 6.7.1
status = addon status = addon
[submodule "qtgraphs"] [submodule "qtgraphs"]
depends = qtbase qtdeclarative qtquick3d depends = qtbase qtdeclarative qtquick3d
path = qtgraphs path = qtgraphs
url = ../qtgraphs.git url = ../qtgraphs.git
branch = 6.7.3 branch = 6.7.1
status = preview status = preview

View File

@@ -29,26 +29,16 @@ include(ECMOptionalAddSubdirectory)
qt_internal_top_level_before_build_submodules() qt_internal_top_level_before_build_submodules()
qt_internal_find_modules(known_submodules)
# Get submodule list if not already defined # Get submodule list if not already defined
if(NOT QT_BUILD_SUBMODULES) if(NOT QT_BUILD_SUBMODULES)
if(DEFINED ENV{QT_BUILD_SUBMODULES}) if(DEFINED ENV{QT_BUILD_SUBMODULES})
set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}") set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
else() else()
set(QT_BUILD_SUBMODULES "${known_submodules}") qt_internal_find_modules(QT_BUILD_SUBMODULES)
endif() endif()
endif() endif()
set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build") set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
# Preliminary check if module should be skipped since -skip <module> or BUILD_<module>
# are provided.
set(explicitly_skipped_modules "")
foreach(module IN LISTS known_submodules)
if(DEFINED BUILD_${module} AND NOT BUILD_${module})
list(APPEND explicitly_skipped_modules ${module})
endif()
endforeach()
foreach(module IN LISTS QT_BUILD_SUBMODULES) foreach(module IN LISTS QT_BUILD_SUBMODULES)
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt) if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${module}/CMakeLists.txt)
message(FATAL_ERROR message(FATAL_ERROR
@@ -58,8 +48,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES)
endif() endif()
endforeach() endforeach()
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES)
SKIP_MODULES ${explicitly_skipped_modules})
foreach(module IN LISTS QT_BUILD_SUBMODULES) foreach(module IN LISTS QT_BUILD_SUBMODULES)
# Check for unmet dependencies # Check for unmet dependencies

View File

@@ -111,12 +111,10 @@ endfunction()
# #
# NORMALIZE_REPO_NAME_IF_NEEDED Will remove 'tqtc-' from the beginning of submodule dependencies # NORMALIZE_REPO_NAME_IF_NEEDED Will remove 'tqtc-' from the beginning of submodule dependencies
# if a tqtc- named directory does not exist. # if a tqtc- named directory does not exist.
#
# SKIP_MODULES Modules that should be skipped from evaluation completely.
function(qt_internal_resolve_module_dependencies module out_ordered out_revisions) function(qt_internal_resolve_module_dependencies module out_ordered out_revisions)
set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED) set(options IN_RECURSION NORMALIZE_REPO_NAME_IF_NEEDED)
set(oneValueArgs REVISION SKIPPED_VAR) set(oneValueArgs REVISION SKIPPED_VAR)
set(multiValueArgs PARSED_DEPENDENCIES SKIP_MODULES) set(multiValueArgs PARSED_DEPENDENCIES)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
# Clear the property that stores the repositories we've already seen. # Clear the property that stores the repositories we've already seen.
@@ -124,10 +122,10 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
set_property(GLOBAL PROPERTY _qt_internal_seen_repos) set_property(GLOBAL PROPERTY _qt_internal_seen_repos)
endif() endif()
# Bail out if we've seen the module already or it was skipped explicitly from command line. # Bail out if we've seen the module already.
qt_internal_resolve_module_dependencies_set_skipped(FALSE) qt_internal_resolve_module_dependencies_set_skipped(FALSE)
get_property(seen GLOBAL PROPERTY _qt_internal_seen_repos) get_property(seen GLOBAL PROPERTY _qt_internal_seen_repos)
if(module IN_LIST seen OR module IN_LIST arg_SKIP_MODULES) if(module IN_LIST seen)
qt_internal_resolve_module_dependencies_set_skipped(TRUE) qt_internal_resolve_module_dependencies_set_skipped(TRUE)
return() return()
endif() endif()
@@ -173,17 +171,11 @@ function(qt_internal_resolve_module_dependencies module out_ordered out_revision
set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency}) set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
endif() endif()
set(extra_options "")
if(arg_SKIP_MODULES)
list(APPEND extra_options SKIP_MODULES ${arg_SKIP_MODULES})
endif()
qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions qt_internal_resolve_module_dependencies(${dependency} dep_ordered dep_revisions
REVISION "${revision}" REVISION "${revision}"
SKIPPED_VAR skipped SKIPPED_VAR skipped
IN_RECURSION IN_RECURSION
${normalize_arg} ${normalize_arg}
${extra_options}
) )
if(NOT skipped) if(NOT skipped)
list(APPEND ordered ${dep_ordered}) list(APPEND ordered ${dep_ordered})
@@ -206,14 +198,8 @@ endfunction()
# modules is the initial list of repos. # modules is the initial list of repos.
# out_all_ordered is the variable name where the result is stored. # out_all_ordered is the variable name where the result is stored.
# #
# SKIP_MODULES Modules that should be skipped from evaluation completely.
#
# See qt_internal_resolve_module_dependencies for side effects. # See qt_internal_resolve_module_dependencies for side effects.
function(qt_internal_sort_module_dependencies modules out_all_ordered) function(qt_internal_sort_module_dependencies modules out_all_ordered)
set(options "")
set(oneValueArgs "")
set(multiValueArgs SKIP_MODULES)
cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
# Create a fake repository "all_selected_repos" that has all repositories from the input as # Create a fake repository "all_selected_repos" that has all repositories from the input as
# required dependency. The format must match what qt_internal_parse_dependencies produces. # required dependency. The format must match what qt_internal_parse_dependencies produces.
@@ -222,15 +208,9 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered)
list(APPEND all_selected_repos_as_parsed_dependencies "${module}/HEAD/FALSE") list(APPEND all_selected_repos_as_parsed_dependencies "${module}/HEAD/FALSE")
endforeach() endforeach()
set(extra_args "")
if(arg_SKIP_MODULES)
set(extra_args SKIP_MODULES ${arg_SKIP_MODULES})
endif()
qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions qt_internal_resolve_module_dependencies(all_selected_repos ordered unused_revisions
PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies} PARSED_DEPENDENCIES ${all_selected_repos_as_parsed_dependencies}
NORMALIZE_REPO_NAME_IF_NEEDED NORMALIZE_REPO_NAME_IF_NEEDED
${extra_args}
) )
# Drop "all_selected_repos" from the output. It depends on all selected repos, thus it must be # Drop "all_selected_repos" from the output. It depends on all selected repos, thus it must be

View File

@@ -62,7 +62,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-msvc2019' Id: 'windows-10_22h2-msvc2019'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -72,9 +72,57 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
] ]
-
Id: 'windows-11_22h2-msvc2019'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-
Id: 'windows-11_23H2-msvc2019'
Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure']
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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-
Id: 'windows-10_22h2-msvc2022'
Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
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}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2022'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure']
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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
- -
Id: 'windows-11_23H2-msvc2022' Id: 'windows-11_23H2-msvc2022'
Template: 'qtci-windows-11_23H2-x86_64-53' Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'MSVC2022' Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging'] Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging']
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
@@ -86,7 +134,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-msvc2019-developer-build' Id: 'windows-10_22h2-msvc2019-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
@@ -98,7 +146,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-msvc2019-arm64' Id: 'windows-10_22h2-msvc2019-arm64'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'arm64' Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
@@ -112,6 +160,56 @@ Configurations:
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
] ]
-
Id: 'windows-11_22h2-msvc2019-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_23H2-msvc2019-developer-build'
Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-debug-and-release -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}}\..',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'windows-11_22h2-msvc2019-arm64'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'windows-11_22h2-msvc2019-developer-build'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
-
Id: 'windows-11_23H2-msvc2019-arm64'
Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure']
Platform dependency: 'windows-11_23H2-msvc2019-developer-build'
Environment variables: [
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc',
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
]
- -
Id: 'rhel-8.8' Id: 'rhel-8.8'
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
@@ -168,7 +266,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-mingw11' Id: 'windows-10_22h2-mingw11'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'Mingw' Compiler: 'Mingw'
Features: ['Packaging', 'Sccache', 'UseConfigure'] Features: ['Packaging', 'Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -180,8 +278,21 @@ Configurations:
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
] ]
- -
Id: 'windows-11_23H2-llvm' Id: 'windows-10_22h2-llvm'
Template: 'qtci-windows-11_23H2-x86_64-53' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'Clang'
Features: ['Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
]
-
Id: 'windows-11_22h2-llvm'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging','Sccache', 'UseConfigure'] Features: ['Packaging','Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
@@ -189,12 +300,51 @@ Configurations:
'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}', 'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
] ]
-
Id: 'windows-11_23H2-llvm'
Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'Clang'
Features: ['Packaging','Sccache', 'UseConfigure']
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
Environment variables: [
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
]
-
Id: 'windows-10_22h2-mingw11-developer-build'
Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
]
-
Id: 'windows-11_22h2-mingw11-developer-build'
Template: 'qtci-windows-11_22H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
]
- -
Id: 'windows-11_23H2-mingw11-developer-build' Id: 'windows-11_23H2-mingw11-developer-build'
Template: 'qtci-windows-11_23H2-x86_64-53' Template: 'qtci-windows-11_23H2-x86_64-52'
Compiler: 'Mingw' Compiler: 'Mingw'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples'

View File

@@ -11,7 +11,7 @@ Configurations:
] ]
- -
Id: 'windows-10_22h2-minimal-static' Id: 'windows-10_22h2-minimal-static'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib'

View File

@@ -17,7 +17,7 @@ Configurations:
] ]
- -
Id: 'android-armv7-on-windows' Id: 'android-armv7-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'armv7' Target arch: 'armv7'
Compiler: 'Mingw' Compiler: 'Mingw'

View File

@@ -14,7 +14,7 @@ Configurations:
] ]
- -
Id: 'webassembly-windows' Id: 'webassembly-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Target os: 'WebAssembly' Target os: 'WebAssembly'
Compiler: 'Mingw' Compiler: 'Mingw'
Target compiler: 'Clang' Target compiler: 'Clang'

View File

@@ -7,7 +7,7 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions'] Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'UseLegacyInstructions'] Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
@@ -18,7 +18,7 @@ Configurations:
Features: ['Packaging', 'UseLegacyInstructions'] Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Target arch: 'x86' Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions'] Features: ['Packaging', 'UseLegacyInstructions']

View File

@@ -7,7 +7,7 @@ Include: [
Configurations: Configurations:
- -
Id: 'qnx-710-arm64-on-windows' Id: 'qnx-710-arm64-on-windows'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Target os: 'QNX_710' Target os: 'QNX_710'
Target arch: 'arm64' Target arch: 'arm64'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'

View File

@@ -2,7 +2,7 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['DisableTests'] Features: ['DisableTests']
- -

View File

@@ -2,19 +2,19 @@ Version: 2
Module only: True Module only: True
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10-x86-4'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
- -
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Compiler: 'GCC' Compiler: 'GCC'
@@ -22,7 +22,13 @@ Configurations:
Configure arguments: '' Configure arguments: ''
Environment variables: [] Environment variables: []
- -
Template: 'qtci-macos-14-arm-106' Template: 'qtci-linux-RHEL-9.2-x86_64-51'
Compiler: 'GCC'
Features: ['Qt5', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Features: ['Packaging', 'Sccache', 'DebugAndRelease']
Configure arguments: '' Configure arguments: ''

View File

@@ -46,7 +46,7 @@ Configurations:
] ]
- -
Id: 'Windows-MSVC2019_Static' Id: 'Windows-MSVC2019_Static'
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'MSVC2019' Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] 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 -plugin-sql-sqlite -plugin-sql-odbc' Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql -plugin-sql-sqlite -plugin-sql-odbc'

View File

@@ -1,7 +1,7 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Template: 'qtci-windows-10_22H2-x86_64-52' Template: 'qtci-windows-10_22H2-x86_64-51'
Compiler: 'Mingw' Compiler: 'Mingw'
Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH']
Features: ['Packaging', UseLegacyInstructions'] Features: ['Packaging', UseLegacyInstructions']

View File

@@ -74,17 +74,11 @@ Reboot
* Sysmain disabled: * Sysmain disabled:
- 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'SysMain' - stop & disable - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'SysMain' - stop & disable
# Don't disable Windows Update before running '01-enable-dotnet-framework.ps1'. Script requires Windows update to be enabled! # Don't disable Windows Update before running '01-enable-dotnet-framework.ps1'. Script requires Windows update to be enabled!
* Install msvc2019 and msvc2022 (follow the msvc2019.txt and msvc2022.txt files)
- After installation: Open Task Scheduler: Task Scheduler Library > Microsoft > VisualStudio > Updates > right-click: BackgroundDownload > disable
* Windows update: * Windows update:
- Settings - Windows Update - run available updates (Windows update2022-09 Cumulative Update for Windows 11 Version 22H2 for x64-based Systems (KB5017321)) - Settings - Windows Update - run available updates (Windows update2022-09 Cumulative Update for Windows 11 Version 22H2 for x64-based Systems (KB5017321))
- After reboot disable windows updates: - After reboot disable windows updates:
- 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows updates' - stop & disable - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows updates' - stop & disable
* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" * Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support"
* Disable Edge update/installer
- Open services.msc: search 'Microsoft Edge Update Service (edgeupdate)' > stop and disable
* Disable Onedrive
- Open Task Manager: startup tab > Microsoft OneDrive > Disabled
* (Restart Windows) * (Restart Windows)
* Google Chrome installed for RTA * Google Chrome installed for RTA
* Virus & threat protection settings: * Virus & threat protection settings:

View File

@@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then
fi fi
# QNX SDP # QNX SDP
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz" sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
targetFile="qnx710.tar.xz" targetFile="qnx710.tar.xz"
sha1="cd2d35004fb2798089e29d9e1226691426632da0" sha1="134af2e0f75d7b7c516f824fafee265b89e51d48"
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
sudo cp "$aarch64le_toolchain" "$targetPath" sudo cp "$aarch64le_toolchain" "$targetPath"

View File

@@ -21,7 +21,7 @@ lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1
lib/libEGL.so.1=usr/lib/libEGL.so.1 lib/libEGL.so.1=usr/lib/libEGL.so.1
lib/libz.so.2=usr/lib/libz.so.2 lib/libz.so.2=usr/lib/libz.so.2
lib/libxml2.so.2=usr/lib/libxml2.so.2 lib/libxml2.so.2=usr/lib/libxml2.so.2
lib/libfreetype.so.24=usr/lib/libfreetype.so.24 lib/libfreetype.so.23=usr/lib/libfreetype.so.23
lib/libbz2.so.1=usr/lib/libbz2.so.1 lib/libbz2.so.1=usr/lib/libbz2.so.1
lib/liblzma.so.5=usr/lib/liblzma.so.5 lib/liblzma.so.5=usr/lib/liblzma.so.5
lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1 lib/libbacktrace.so.1=usr/lib/libbacktrace.so.1

View File

@@ -6,12 +6,7 @@ set -ex
source "${BASH_SOURCE%/*}/../unix/sccache.sh" source "${BASH_SOURCE%/*}/../unix/sccache.sh"
targetArch=x86_64-apple-darwin
targetVersion=0.2.14 targetVersion=0.2.14
if [[ `arch` == arm* ]]; then sha1=764bc1664c0ff616d9980a6d127175d0a2041781
targetArch=aarch64-apple-darwin
sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc
else
targetArch=x86_64-apple-darwin
sha1=764bc1664c0ff616d9980a6d127175d0a2041781
fi
installSccache "$targetArch" "$targetVersion" "$sha1" installSccache "$targetArch" "$targetVersion" "$sha1"

View File

@@ -1,5 +1,5 @@
set(CMAKE_SYSTEM_NAME QNX) set(CMAKE_SYSTEM_NAME QNX)
set(CMAKE_SYSTEM_PROCESSOR armle-v7) set(CMALE_SYSTEM_PROCESSOR armv7le)
if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)

View File

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0.2" version="n6.1.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version" ffmpeg_name="FFmpeg-$version"

View File

@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
version="n7.0.2" version="n6.1.1"
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version" ffmpeg_name="FFmpeg-$version"

View File

@@ -20,33 +20,33 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
# shellcheck source=./common.sourced.sh # shellcheck source=./common.sourced.sh
source "$PROVISIONING_DIR"/common/unix/common.sourced.sh source "$PROVISIONING_DIR"/common/unix/common.sourced.sh
libclang_version="17.0.6" libclang_version="15.0.0"
if uname -a |grep -q Darwin; then if uname -a |grep -q Darwin; then
version=$libclang_version version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z" url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z"
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z"
sha1="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78" sha1="6d916a17459c81551dde47580ae3f071e93338a5"
elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep -v "8" ; then
version=$libclang_version version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z" url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
sha1="102374379af906bd26085fcd18047cac4d0fb7bf" sha1="6ca035bb522022d34d61759e0460845832933b5c"
elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
version=$libclang_version version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f" sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then elif [ "$PROVISIONING_OS_ID" = debian ]; then
version=$libclang_version version=17.0.1
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z" url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93" sha1="43f0210121b889107e3dab631e8104e661a3866b"
else else
version=$libclang_version version=$libclang_version
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z" url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
sha1="2a58cc71ad90eb6234c56ef7b141f32361b4312a" sha1="bd6615012b8bdb2720a45ede56e05f6db7191843"
fi fi
zip="/tmp/libclang.7z" zip="/tmp/libclang.7z"

View File

@@ -196,28 +196,6 @@ function Is64BitWinHost
return [environment]::Is64BitOperatingSystem return [environment]::Is64BitOperatingSystem
} }
enum CpuArch {
x64
x86
arm64
unknown
}
function Get-CpuArchitecture
{
# Possible values are "AMD64", "IA64", "ARM64", and "x86"
$arch = [System.Environment]::GetEnvironmentVariable('PROCESSOR_ARCHITECTURE', 'Machine')
if ($arch -eq "AMD64") {
return [CpuArch]::x64
} elseif ($arch -eq "x86") {
return [CpuArch]::x86
} elseif ($arch -eq "ARM64") {
return [CpuArch]::arm64
}
return [CpuArch]::unknown
}
function IsProxyEnabled { function IsProxyEnabled {
return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
} }
@@ -297,52 +275,13 @@ function DeleteSchedulerTask {
SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F
} }
function GetVsProperty { function GetVSPath {
Param ( Param (
[string]$Component = 'Microsoft.VisualStudio.Component.VC.CoreIde', [string]$VSWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe",
[string]$Property, [string]$Component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64"
[switch]$Latest
) )
$vsWhereProcessInfo = New-Object System.Diagnostics.ProcessStartInfo return (& $VSWhere -nologo -latest -products * -requires $Component -property installationPath)
$vsWhereProcessInfo.FileName = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe"
$vsWhereProcessInfo.RedirectStandardError = $true
$vsWhereProcessInfo.RedirectStandardOutput = $true
$vsWhereProcessInfo.UseShellExecute = $false
# -sort: sorts the instances from newest version and last installed to oldest
$vsWhereProcessInfo.Arguments = " -nologo -sort -products * -requires $Component -property $Property"
if ($Latest) {
# -latest: return only the newest version and last installed
$vsWhereProcessInfo.Arguments += ' -latest'
}
$vsWhereProcess = New-Object System.Diagnostics.Process
$vsWhereProcess.StartInfo = $vsWhereProcessInfo
$vsWhereProcess.Start() | Out-Null
$vsWhereProcess.WaitForExit()
$standardOutput = $vsWhereProcess.StandardOutput.ReadToEnd()
if ([string]::IsNullOrEmpty($standardOutput)) {
throw "vswhere could not find property '$Property'"
}
$exitCode = $vsWhereProcess.ExitCode
if ($exitCode -ne 0) {
$standardError = $vsWhereProcess.StandardError.ReadToEnd()
throw "vswhere failed with exit code $exitCode ($standardError)"
}
return $standardOutput.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries) | Select-Object -Last 1
}
function GetVsInstallationPath {
Param (
[switch]$Latest
)
return GetVsProperty -Property 'installationPath' @PSBoundParameters
} }
function EnterVSDevShell { function EnterVSDevShell {
@@ -351,11 +290,13 @@ function EnterVSDevShell {
[string]$Arch = "amd64" [string]$Arch = "amd64"
) )
$vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe"
$vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde"
# We pick the oldest build tools we can find and use that to be compatible with it and any newer version: # We pick the oldest build tools we can find and use that to be compatible with it and any newer version:
# If MSVC has an ABI break this will stop working, and yet another build must be added. # If MSVC has an ABI break this will stop working, and yet another build must be added.
$VSPath = GetVsInstallationPath $VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1)
Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch -VsInstallPath='$VSPath')" Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch)"
try { try {
Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll" Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll"
Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo" Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo"

View File

@@ -6,20 +6,20 @@
# This script will install FFmpeg # This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash" $msys = "C:\Utils\msys64\usr\bin\bash"
$version="n7.0.2" $version = "n6.1.1"
$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" $ffmpeg_name = "ffmpeg-" + $version;
$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" $sha1 = "7AECCED8A0366BE407329B4E176167534233DA12"
$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
$ffmpeg_name="FFmpeg-$version"
$download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz" $url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
$download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip"
$unzip_location = "C:\" $unzip_location = "C:\"
Write-Host "Fetching FFmpeg $version..." Write-Host "Fetching FFmpeg $version..."
Download $url_public $url_cached $download_location Download $url_public $url_cached $download_location
Verify-Checksum $download_location $sha1 Verify-Checksum $download_location $sha1
Extract-tar_gz $download_location $unzip_location Extract-7Zip $download_location $unzip_location
Remove $download_location Remove $download_location
$config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"

View File

@@ -4,50 +4,47 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
# This script will install Java SE # This script will install Java SE
# https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html
$version_major = "17"
$installdir = "C:\Program Files\Java\jdk-$version_major"
$cpu_arch = Get-CpuArchitecture if (Is64BitWinHost) {
switch ($cpu_arch) { $version = "11.0.12"
arm64 { $arch = "x64"
$version = "17.0.11" $sha1 = "135ffd1c350509729551876232a5354070732e92"
$arch = "aarch64" $installdir = "C:\Program Files\Java\jdk-$version"
$sha1 = "1c5984a185778ad91498b746e677d84e153d5918" $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
# Using Microsoft build version of OpenJDK from: https://learn.microsoft.com/en-us/java/openjdk/download } else {
# as there are no available Windows ARM64 versions of JDK from Oracle $version = "11.0.11.9"
$url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.msi" $arch = "x86-32"
$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi" $sha1 = "a861e994208ee85bf83a76105f6858feeb6fbb33"
$javaPackage = "C:\Windows\Temp\jdk-$version.msi" $installdir = "C:\Program Files\AdoptOpenJDK\jdk-$version-hotspot"
Break $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.11_9.msi"
}
x64 {
$version = "17.0.10"
$arch = "x64"
$sha1 = "d573091930076c3ffa9f74273cb41cb5c75c5400"
$url_official = "https://download.oracle.com/java/17/archive/jdk-${version}_windows-${arch}_bin.exe"
$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe"
$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
Break
}
default {
throw "Unknown architecture $cpu_arch"
}
} }
Write-Host "Fetching Java SE $version" # NOTE! Official URL is behind login portal. It can't be used whit this script instead it need to be fetched to $url_cache first
# java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows
# java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
if (Is64BitWinHost) {
$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
} else {
$javaPackage = "C:\Windows\Temp\jdk-$version.msi"
}
Write-Host "Fetching Java SE $version..."
$ProgressPreference = 'SilentlyContinue' $ProgressPreference = 'SilentlyContinue'
Download $url_official $url_cache $javaPackage Write-Host "...from local cache"
Download $url_cache $url_cache $javaPackage
Verify-Checksum $javaPackage $sha1 Verify-Checksum $javaPackage $sha1
if ($javaPackage.EndsWith(".exe")) { if (Is64BitWinHost) {
Run-Executable "$javaPackage" "/s SPONSORS=0" Run-Executable "$javaPackage" "/s SPONSORS=0"
} else { } else {
Run-Executable "msiexec" "/quiet /i $javaPackage" Run-Executable "msiexec" "/quiet /i $javaPackage"
} }
Remove "$javaPackage" Remove "$javaPackage"
Write-Host "Remove Java update from startup"
reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f
Set-EnvironmentVariable "JAVA_HOME" "$installdir" Set-EnvironmentVariable "JAVA_HOME" "$installdir"
Prepend-Path "$installdir\bin" Add-Path "$installdir\bin"
Write-Output "Java SE = $version $arch" >> ~\versions.txt Write-Output "Java SE = $version $arch" >> ~\versions.txt

View File

@@ -5,7 +5,7 @@ param(
) )
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$libclang_version="17.0.6" $libclang_version="15.0.0"
Write-Output "libClang = $libclang_version" >> ~/versions.txt Write-Output "libClang = $libclang_version" >> ~/versions.txt
# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
@@ -38,7 +38,7 @@ $toolchainSuffix = ""
if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "vs2019" ) {
if ( $archVer -eq 64 ) { if ( $archVer -eq 64 ) {
$sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa" $sha1 = "e7c2d27f0e99d63e49225cb1be18c76a1e2a124b"
} }
else { else {
$sha1 = "" $sha1 = ""
@@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) {
if ( $toolchain -eq "mingw" ) { if ( $toolchain -eq "mingw" ) {
if ( $archVer -eq 64 ) { if ( $archVer -eq 64 ) {
$sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed" $sha1 = "6c9300051533d5648ffe3e8ae1eb00decae8e6bf"
} }
else { else {
$sha1 = "" $sha1 = ""
@@ -56,18 +56,6 @@ if ( $toolchain -eq "mingw" ) {
$toolchainSuffix = "mingw" $toolchainSuffix = "mingw"
} }
if ( $toolchain -eq "llvm-mingw" ) {
if ( $archVer -eq 64 ) {
$sha1 = "1844f107d067b69deabf375fc024848c1c8b015d"
}
else {
$sha1 = ""
}
# Due to COIN-1137 forced to use a '_' instead of '-'
$toolchainSuffix = "llvm_mingw"
}
install $sha1 $baseDestination-$archVer install $sha1 $baseDestination-$archVer
if ( $setDefault ) { if ( $setDefault ) {

View File

@@ -0,0 +1,87 @@
# Copyright (C) 2020 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
# This script installs Python $version.
# Python is required for building Qt 5 from source.
param(
[Int32]$archVer=32,
[string]$targetDir="C:\Python27"
)
. "$PSScriptRoot\helpers.ps1"
$version = "2.7.13"
if ( $archVer -eq 64 ) {
$arch = ".amd64"
$sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
} else {
$arch = ""
$sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
}
$package = "C:\Windows\temp\python-$version.msi"
$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi"
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\python-$version" + $arch + ".msi"
Write-Host "Fetching from URL..."
Download $externalUrl $internalUrl $package
Verify-Checksum $package $sha1
# Python installation is flaky, but seems to pass with second run if error occurs.
$stop = $false
[int]$retry = "0"
do {
try {
# /levx = e:'All error messages' v:'Verbose' x:'Extra debugging info'
Run-Executable "msiexec" "/passive /i $package /levx C:\Windows\Temp\Python_log.log TARGETDIR=$targetDir ALLUSERS=1"
$stop = $true
}
catch {
Get-Content C:\Windows\Temp\Python_log.log -Tail 50
if ($retry -gt 2) {
Write-Host "Python installation failed!"
throw
}
else {
Write-Host "Couldn't install python, retrying in 30 seconds"
Start-Sleep -s 30
$retry = $retry + 1
}
}
}
while ($stop -ne $true)
# We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
Write-Host "Changing allowZip64 value to 'True'..."
(Get-Content $targetDir\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content $targetDir\lib\zipfile.py
Remove "$package"
# When installing 32 bit python to 64 bit host, we want to keep only default python in path
# For cross-compilation we export some helper env variable
if (($archVer -eq 32) -And (Is64BitWinHost)) {
Set-EnvironmentVariable "PYTHON2_32_PATH" "$targetDir"
Set-EnvironmentVariable "PIP2_32_PATH" "$targetDir\Scripts"
} else {
Add-Path "$targetDir;$targetDir\Scripts"
}
Run-Executable "$targetDir\python.exe" "-m ensurepip"
Write-Host "Upgrade pip to the latest version available."
Run-Executable "$targetDir\python.exe" "-m pip install --upgrade pip"
Write-Host "Configure pip"
Run-Executable "$targetDir\python.exe" "-m pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache"
Run-Executable "$targetDir\python.exe" "-m pip config --user set global.extra-index-url https://pypi.org/simple/"
# Install python virtual env
if (IsProxyEnabled) {
$proxy = Get-Proxy
Write-Host "Using proxy ($proxy) with pip"
$pip_args = "--proxy=$proxy"
}
Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install virtualenv"
# Install PyPDF2 for QSR documentation
Run-Executable "$targetDir\Scripts\pip.exe" "$pip_args install PyPDF2"
Write-Output "Python-$archVer = $version" >> ~/versions.txt

View File

@@ -28,10 +28,10 @@ $folderName = "qnx710"
$targetPath = "$targetFolder$folderName" $targetPath = "$targetFolder$folderName"
# QNX SDP # QNX SDP
$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20240417.tar.xz" $cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx710-windows-linux-20220405.tar.xz"
$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20240417.tar.xz" $sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz"
$targetFile = "qnx710.tar.xz" $targetFile = "qnx710.tar.xz"
$sha1 = "cd2d35004fb2798089e29d9e1226691426632da0" $sha1 = "134af2e0f75d7b7c516f824fafee265b89e51d48"
DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl
Copy-Item $aarch64le_toolchain $targetPath Copy-Item $aarch64le_toolchain $targetPath

View File

@@ -78,12 +78,6 @@ installPackages+=(libasound2-dev)
installPackages+=(libgstreamer1.0-dev) installPackages+=(libgstreamer1.0-dev)
installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev)
installPackages+=(gstreamer1.0-libav)
installPackages+=(gstreamer1.0-plugins-base)
installPackages+=(gstreamer1.0-plugins-good)
installPackages+=(gstreamer1.0-plugins-bad)
installPackages+=(gstreamer1.0-plugins-rtp)
installPackages+=(gstreamer1.0-plugins-ugly)
installPackages+=(libgstreamer-gl1.0-0) installPackages+=(libgstreamer-gl1.0-0)
installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-base-1.0)
installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0)
@@ -169,7 +163,6 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)
# Needed for qtdltlogging # Needed for qtdltlogging

View File

@@ -27,7 +27,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libEGL-devel)
installPackages+=(mesa-libGL-devel) installPackages+=(mesa-libGL-devel)

View File

@@ -28,7 +28,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libEGL-devel)
installPackages+=(mesa-libGL-devel) installPackages+=(mesa-libGL-devel)

View File

@@ -29,7 +29,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# update kernel # update kernel
installPackages+=(kernel) installPackages+=(kernel)
installPackages+=(kernel-tools) installPackages+=(kernel-tools)

View File

@@ -29,7 +29,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# update kernel # update kernel
installPackages+=(kernel) installPackages+=(kernel)
installPackages+=(kernel-tools) installPackages+=(kernel-tools)
@@ -88,7 +87,7 @@ installPackages+=(python3-html5lib)
installPackages+=(libatomic) installPackages+=(libatomic)
installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64)
# For Android builds # For Android builds
installPackages+=(java-17-openjdk-devel-17.0.9.0.9) installPackages+=(java-11-openjdk-devel-11.0.19.0.7)
# For receiving shasum # For receiving shasum
installPackages+=(perl-Digest-SHA) installPackages+=(perl-Digest-SHA)
# INTEGRITY requirements # INTEGRITY requirements

View File

@@ -29,7 +29,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)
@@ -81,7 +80,7 @@ installPackages+=(python3-html5lib)
installPackages+=(mesa-libgbm-devel-21.3.4-2.el9) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9)
installPackages+=(libstdc++-static) installPackages+=(libstdc++-static)
# For Android builds # For Android builds
installPackages+=(java-17-openjdk-devel-17.0.9.0.9) installPackages+=(java-11-openjdk-devel-11.0.19.0.7)
# For receiving shasum # For receiving shasum
installPackages+=(perl-Digest-SHA) installPackages+=(perl-Digest-SHA)
# INTEGRITY requirements # INTEGRITY requirements

View File

@@ -1,10 +0,0 @@
#!/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
# Install xcb-util-cursor* libraries before updating repos. In updated repos these libraries are no longer available.
# QTQAINFRA-6325
sudo yum -y install xcb-util-cursor
sudo yum -y install xcb-util-cursor-devel

View File

@@ -29,7 +29,6 @@ installPackages+=(ninja-build)
installPackages+=(pcre2-devel) installPackages+=(pcre2-devel)
installPackages+=(double-conversion-devel) installPackages+=(double-conversion-devel)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-devel)
# EGL support # EGL support
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
#installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) #installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)
@@ -94,7 +93,7 @@ installPackages+=(python3-html5lib)
installPackages+=(libstdc++-static) installPackages+=(libstdc++-static)
installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64)
# For Android builds # For Android builds
installPackages+=(java-17-openjdk-devel-17.0.9.0.9) installPackages+=(java-11-openjdk-devel)
# For receiving shasum # For receiving shasum
installPackages+=(perl-Digest-SHA) installPackages+=(perl-Digest-SHA)
# INTEGRITY requirements # INTEGRITY requirements

View File

@@ -80,12 +80,6 @@ installPackages+=(libgstreamer1.0-dev)
installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev)
installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev)
installPackages+=(gstreamer1.0-libav)
installPackages+=(gstreamer1.0-plugins-base)
installPackages+=(gstreamer1.0-plugins-good)
installPackages+=(gstreamer1.0-plugins-bad)
installPackages+=(gstreamer1.0-plugins-rtp)
installPackages+=(gstreamer1.0-plugins-ugly)
installPackages+=(yasm) installPackages+=(yasm)
installPackages+=(libva-dev) installPackages+=(libva-dev)
# for QtMultimedia streaming tests # for QtMultimedia streaming tests

View File

@@ -96,12 +96,6 @@ installPackages+=(libgstreamer1.0-dev)
installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev)
installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev)
installPackages+=(gstreamer1.0-libav)
installPackages+=(gstreamer1.0-plugins-base)
installPackages+=(gstreamer1.0-plugins-good)
installPackages+=(gstreamer1.0-plugins-bad)
installPackages+=(gstreamer1.0-plugins-rtp)
installPackages+=(gstreamer1.0-plugins-ugly)
installPackages+=(libgstreamer-gl1.0-0) installPackages+=(libgstreamer-gl1.0-0)
installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-base-1.0)
installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0)
@@ -198,7 +192,6 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)
# Needed for qtdltlogging # Needed for qtdltlogging

View File

@@ -113,9 +113,8 @@ sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARM64/sysroots/$sysrootARM64/et
# Fix mdns to support both docker and network tests # Fix mdns to support both docker and network tests
# See also https://bugreports.qt.io/browse/QTBUG-106013 # See also https://bugreports.qt.io/browse/QTBUG-106013
sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] mdns4 dns/' \ sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf"
$yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf \ sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf"
$yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf
# Install qemu binfmt for 32bit and 64bit arm architectures # Install qemu binfmt for 32bit and 64bit arm architectures
sudo update-binfmts --package qemu-arm --install arm $yoctoLocationARMv7/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-arm \ sudo update-binfmts --package qemu-arm --install arm $yoctoLocationARMv7/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-arm \

View File

@@ -98,12 +98,6 @@ installPackages+=(libgstreamer-plugins-base1.0-dev)
installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev)
installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev)
installPackages+=(libgstreamer-gl1.0-0) installPackages+=(libgstreamer-gl1.0-0)
installPackages+=(gstreamer1.0-libav)
installPackages+=(gstreamer1.0-plugins-base)
installPackages+=(gstreamer1.0-plugins-good)
installPackages+=(gstreamer1.0-plugins-bad)
installPackages+=(gstreamer1.0-plugins-rtp)
installPackages+=(gstreamer1.0-plugins-ugly)
installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-base-1.0)
installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0)
installPackages+=(yasm) installPackages+=(yasm)
@@ -202,7 +196,6 @@ installPackages+=(ssh)
installPackages+=(diffstat) installPackages+=(diffstat)
installPackages+=(binfmt-support) installPackages+=(binfmt-support)
installPackages+=(zstd) installPackages+=(zstd)
installPackages+=(libzstd-dev)
installPackages+=(lz4) installPackages+=(lz4)
# Vulkan is needed for examples # Vulkan is needed for examples
installPackages+=(libvulkan-dev) installPackages+=(libvulkan-dev)

View File

@@ -113,9 +113,8 @@ sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARM64/sysroots/$sysrootARM64/et
# Fix mdns to support both docker and network tests # Fix mdns to support both docker and network tests
# See also https://bugreports.qt.io/browse/QTBUG-106013 # See also https://bugreports.qt.io/browse/QTBUG-106013
sudo sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] mdns4 dns/' \ sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf"
$yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf \ sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf"
$yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf
# Install qemu binfmt for 32bit and 64bit arm architectures # Install qemu binfmt for 32bit and 64bit arm architectures
sudo update-binfmts --package qemu-arm --install arm $yoctoLocationARMv7/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-arm \ sudo update-binfmts --package qemu-arm --install arm $yoctoLocationARMv7/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-arm \

View File

@@ -12,7 +12,7 @@ brew install --formula "${BASH_SOURCE%/*}/pyenv.rb"
pyenv install 3.9.7 pyenv install 3.9.7
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

View File

@@ -0,0 +1,107 @@
#!/usr/bin/env sh
# Copyright (C) 2020 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 tools for singing packages
# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
set -ex
cache="http://ci-files01-hki.ci.qt.io/input"
cacheSigningTools="$cache/mac/sign_tools"
targetFolder="/Users/qt"
keychains="$targetFolder/Library/Keychains"
Install() {
url=$1
targetFile=$2
expectedSha1=$3
echo "Fetching $targetFile from $url..."
curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
shasum "$targetFile" |grep "$expectedSha1"
}
# qt-license
sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
security default-keychain -s $loginKeychain*
echo "Unlocking Login keychain with password.."
{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
echo "remove the "Lock after X minutes of inactivity" from login.keychain"
security set-keychain-settings $loginKeychain
# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
unlockKeychain=$targetFolder/unlock-keychain.sh
{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
sudo chmod 755 "$unlockKeychain"
# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
csreq=$targetFolder/csreq_qt_company.txt
Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
chmod 755 "$csreq"
# iOS signing tools
devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
echo "Opening $devIDKeychain.."
open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -12,7 +12,7 @@ brew install --formula "${BASH_SOURCE%/*}/pyenv.rb"
pyenv install 3.9.7 pyenv install 3.9.7
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

View File

@@ -0,0 +1,107 @@
#!/usr/bin/env sh
# Copyright (C) 2020 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 tools for singing packages
# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
set -ex
cache="http://ci-files01-hki.ci.qt.io/input"
cacheSigningTools="$cache/mac/sign_tools"
targetFolder="/Users/qt"
keychains="$targetFolder/Library/Keychains"
Install() {
url=$1
targetFile=$2
expectedSha1=$3
echo "Fetching $targetFile from $url..."
curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
shasum "$targetFile" |grep "$expectedSha1"
}
# qt-license
sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
security default-keychain -s $loginKeychain*
echo "Unlocking Login keychain with password.."
{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
echo "remove the "Lock after X minutes of inactivity" from login.keychain"
security set-keychain-settings $loginKeychain
# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
unlockKeychain=$targetFolder/unlock-keychain.sh
{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
sudo chmod 755 "$unlockKeychain"
# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
csreq=$targetFolder/csreq_qt_company.txt
Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
chmod 755 "$csreq"
# iOS signing tools
devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
echo "Opening $devIDKeychain.."
open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -12,7 +12,7 @@ brew install "${BASH_SOURCE%/*}/pyenv.rb"
pyenv install 3.9.7 pyenv install 3.9.7
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

View File

@@ -0,0 +1,107 @@
#!/usr/bin/env sh
# Copyright (C) 2020 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 tools for singing packages
# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
set -ex
cache="http://ci-files01-hki.ci.qt.io/input"
cacheSigningTools="$cache/mac/sign_tools"
targetFolder="/Users/qt"
keychains="$targetFolder/Library/Keychains"
Install() {
url=$1
targetFile=$2
expectedSha1=$3
echo "Fetching $targetFile from $url..."
curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
shasum "$targetFile" |grep "$expectedSha1"
}
# qt-license
sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
security default-keychain -s $loginKeychain*
echo "Unlocking Login keychain with password.."
{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
echo "remove the "Lock after X minutes of inactivity" from login.keychain"
security set-keychain-settings $loginKeychain
# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
unlockKeychain=$targetFolder/unlock-keychain.sh
{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
sudo chmod 755 "$unlockKeychain"
# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
csreq=$targetFolder/csreq_qt_company.txt
Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
chmod 755 "$csreq"
# iOS signing tools
devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
echo "Opening $devIDKeychain.."
open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -12,7 +12,7 @@ brew install pyenv
pyenv install 3.9.7 pyenv install 3.9.7
/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib
SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"
SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/"

View File

@@ -0,0 +1,107 @@
#!/usr/bin/env sh
# Copyright (C) 2020 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 tools for singing packages
# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
set -ex
cache="http://ci-files01-hki.ci.qt.io/input"
cacheSigningTools="$cache/mac/sign_tools"
targetFolder="/Users/qt"
keychains="$targetFolder/Library/Keychains"
Install() {
url=$1
targetFile=$2
expectedSha1=$3
echo "Fetching $targetFile from $url..."
curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
shasum "$targetFile" |grep "$expectedSha1"
}
# qt-license
sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
# Login keychain
sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null
loginKeychain=$keychains/login.keychain
echo "Setting login.keychain as default keychain.."
security default-keychain -s $loginKeychain*
echo "Unlocking Login keychain with password.."
{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null
echo "remove the "Lock after X minutes of inactivity" from login.keychain"
security set-keychain-settings $loginKeychain
# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
unlockKeychain=$targetFolder/unlock-keychain.sh
{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null
sudo chmod 755 "$unlockKeychain"
# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
csreq=$targetFolder/csreq_qt_company.txt
Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
chmod 755 "$csreq"
# iOS signing tools
devIDKeychain="Developer_ID_TheQtCompany.keychain-db"
shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc"
Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
echo "Opening $devIDKeychain.."
open "$keychains/$devIDKeychain"
sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null
echo "Unlocking $devIDKeychain with password.."
{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null
security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null
iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12"
shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
echo "Importing $iPhoneDeveloper.."
{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
iPhoneDistribution="iPhoneDistributionCiTeam2020.p12"
shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d"
Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
echo "Importing $iPhoneDistribution.."
{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null
# Mobileprovision
echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
mkdir "$targetFolder/Library/MobileDevice"
mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da"
Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision
# Removing password files
rm -fr "$targetFolder/login_keychain_password.txt"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -1,4 +1,3 @@
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\install-jdk.ps1"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -1,4 +1,3 @@
# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False
. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 32 "C:\Python27_32"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\python.ps1" 64

2
qt3d

Submodule qt3d updated: 0cdf67bf9f...9524492643

2
qtbase

Submodule qtbase updated: 92b6857849...c195fe7d33

2
qtcoap

Submodule qtcoap updated: b807cc490c...f94fc68499

2
qtdoc

Submodule qtdoc updated: 2584636452...f80fbd6186

2
qtgrpc

Submodule qtgrpc updated: 8b7193ab0d...2f72a53dc2

2
qtmqtt

Submodule qtmqtt updated: b56365621b...f07ac03871

Submodule qtopcua updated: 3e29b57a73...93be31dae3

2
qtqa

Submodule qtqa updated: 0d549d19c4...9d52ae48ff

Submodule qtscxml updated: 3b0ed59f2c...c91c518e6a

Some files were not shown because too many files have changed in this diff Show More