mirror of
git://code.qt.io/qt/qt5.git
synced 2026-08-03 19:35:51 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f6a5b90ab7 | |||
| d4821293c3 |
+2
-2
@@ -5,8 +5,8 @@ Makefile
|
||||
CMakeLists.txt.user*
|
||||
CMakeUserPresets.json
|
||||
.vscode
|
||||
build/
|
||||
build-*/
|
||||
build
|
||||
build-*
|
||||
.DS_Store
|
||||
init-repository.opt
|
||||
init-repository.opt.in
|
||||
|
||||
+93
-46
@@ -1,46 +1,53 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -48,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qttasktree qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -61,7 +68,7 @@
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
@@ -69,243 +76,283 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsystems
|
||||
url = ../qtsystems.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtfeedback"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtmultimedia
|
||||
path = qtfeedback
|
||||
url = ../qtfeedback.git
|
||||
branch = master
|
||||
status = ignore
|
||||
[submodule "qtpim"]
|
||||
depends = qtdeclarative
|
||||
path = qtpim
|
||||
url = ../qtpim.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtconnectivity"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = deprecated
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = deprecated
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = deprecated
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = dev
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
recommends = qtwebsockets
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = addon
|
||||
[submodule "qttasktree"]
|
||||
depends = qtbase
|
||||
path = qttasktree
|
||||
url = ../qttasktree.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = preview
|
||||
[submodule "qtopenapi"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtopenapi
|
||||
url = ../qtopenapi.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = preview
|
||||
[submodule "qtcanvaspainter"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtcanvaspainter
|
||||
url = ../qtcanvaspainter.git
|
||||
branch = 6.11.2
|
||||
branch = 6.11.0
|
||||
status = preview
|
||||
|
||||
@@ -315,7 +315,7 @@ function(qt_ir_get_already_initialized_submodules prefix
|
||||
)
|
||||
|
||||
qt_ir_parse_git_config_file_contents("${prefix}"
|
||||
READ_GIT_CONFIG_LOCAL
|
||||
READ_GIT_CONFIG
|
||||
PARENT_REPO_BASE_GIT_PATH "${parent_repo_base_git_path}"
|
||||
WORKING_DIRECTORY "${working_directory}"
|
||||
)
|
||||
|
||||
+21
-16
@@ -130,11 +130,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
|
||||
set(extra_configure_args "")
|
||||
set(extra_cmake_args "")
|
||||
|
||||
# Collect modules to skip. These may come from:
|
||||
# 1. The -skip option (consumed by init-repository's option parser)
|
||||
# 2. Exclusion entries in -submodules/--module-subset (e.g. -qtfoo)
|
||||
qt_ir_get_option_value(skip skip_modules)
|
||||
|
||||
# If the -submodules or --module-subset options were specified, transform
|
||||
# the values into something configure understands and pass them to configure.
|
||||
qt_ir_get_option_value(module-subset submodules)
|
||||
@@ -142,7 +137,6 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
|
||||
qt_ir_get_top_level_submodules(include_submodules exclude_submodules)
|
||||
if(NOT include_submodules AND arg_ALREADY_INITIALIZED)
|
||||
string(REPLACE "," ";" include_submodules "${submodules}")
|
||||
list(FILTER include_submodules EXCLUDE REGEX "^$")
|
||||
endif()
|
||||
|
||||
# qtrepotools is always implicitly cloned, but it doesn't actually
|
||||
@@ -159,10 +153,25 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
|
||||
endif()
|
||||
|
||||
list(JOIN include_submodules "," include_submodules)
|
||||
list(JOIN exclude_submodules "," exclude_submodules)
|
||||
|
||||
# Merge exclusions from module-subset into the skip list.
|
||||
if(exclude_submodules)
|
||||
list(APPEND skip_modules ${exclude_submodules})
|
||||
# Handle case when the -skip argument is already passed.
|
||||
# In that case read the passed values, merge with new ones,
|
||||
# remove both the -skip and its values, and re-add it later.
|
||||
list(FIND filtered_args "-skip" skip_index)
|
||||
if(exclude_submodules AND skip_index GREATER -1)
|
||||
list(LENGTH filtered_args filtered_args_length)
|
||||
math(EXPR skip_args_index "${skip_index} + 1")
|
||||
|
||||
if(skip_args_index LESS filtered_args_length)
|
||||
list(GET filtered_args "${skip_args_index}" skip_args)
|
||||
string(REPLACE "," ";" skip_args "${skip_args}")
|
||||
list(APPEND skip_args ${exclude_submodules})
|
||||
list(REMOVE_DUPLICATES skip_args)
|
||||
list(JOIN skip_args "," exclude_submodules)
|
||||
list(REMOVE_AT filtered_args "${skip_args_index}")
|
||||
list(REMOVE_AT filtered_args "${skip_index}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Handle case when only '-submodules existing' is passed and the
|
||||
@@ -170,13 +179,9 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var)
|
||||
if(include_submodules)
|
||||
list(APPEND extra_configure_args "-submodules" "${include_submodules}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Forward all collected skip modules to configure.
|
||||
if(skip_modules)
|
||||
list(REMOVE_DUPLICATES skip_modules)
|
||||
list(JOIN skip_modules "," skip_csv)
|
||||
list(APPEND extra_configure_args "-skip" "${skip_csv}")
|
||||
if(exclude_submodules)
|
||||
list(APPEND extra_configure_args "-skip" "${exclude_submodules}")
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Insert the extra arguments into the proper positions before and after '--'.
|
||||
|
||||
@@ -1386,7 +1386,7 @@ function(qt_internal_foreach_repo_run)
|
||||
|
||||
set(color_supported FALSE)
|
||||
set(output_goes_where "")
|
||||
if(NOT tty_exit_code AND tty_name)
|
||||
if(NOT tty_exit_CODE AND tty_name)
|
||||
set(color_supported TRUE)
|
||||
set(output_goes_where "OUTPUT_FILE" "${tty_name}")
|
||||
endif()
|
||||
|
||||
@@ -16,13 +16,6 @@ instructions:
|
||||
variableName: CONFIGURE_ENV_PREFIX
|
||||
variableValue: "{{.Env.ENV_PREFIX}}"
|
||||
|
||||
# Re-fetch the qlitehtml repository in the Coin git mirror, otherwise the
|
||||
# RunCMake.InitRepository test might fail trying to checkout a newer sha1 than what is
|
||||
# available in the Coin git mirror.
|
||||
- type: UpdateRepo
|
||||
gitRemote: code.qt.io
|
||||
repos: [playground/qlitehtml.git]
|
||||
|
||||
- type: ExecuteCommand
|
||||
command: "{{.Env.CONFIGURE_ENV_PREFIX}} cmake {{.SourceDir}}/tests/manual/RunCMake"
|
||||
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
|
||||
|
||||
@@ -62,7 +62,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
|
||||
'VCPKG_HOST_TRIPLET=arm64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=arm64-linux-qt',
|
||||
]
|
||||
@@ -155,7 +155,6 @@ Configurations:
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'VCPKG_HOST_TRIPLET=x64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
|
||||
'SCCACHE_C_CUSTOM_CACHE_BUSTER=v1'
|
||||
]
|
||||
-
|
||||
Id: 'sles-15_sp6-static'
|
||||
@@ -186,12 +185,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'Packaging', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
||||
'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_clangcpp=OFF -DINPUT_headersclean=ON',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'VCPKG_HOST_TRIPLET=x64-windows-qt',
|
||||
@@ -215,7 +214,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-arm64'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Target arch: 'arm64'
|
||||
Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
@@ -225,9 +224,9 @@ Configurations:
|
||||
'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer',
|
||||
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'OPENSSL_INCLUDE={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
|
||||
'OPENSSL_LIB={{.Env.OPENSSL_LIB_x64_arm64}}',
|
||||
'OPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
|
||||
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
|
||||
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
|
||||
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}',
|
||||
'VCPKG_HOST_TRIPLET=x64-windows-qt',
|
||||
'VCPKG_TARGET_TRIPLET=arm64-windows-qt',
|
||||
@@ -243,7 +242,7 @@ Configurations:
|
||||
Platform dependency: 'windows-11_24H2-msvc2022-arm64'
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-developer-build'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
|
||||
@@ -263,7 +262,7 @@ Configurations:
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DINPUT_tiff=qt -DINPUT_webp=qt',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON',
|
||||
'VCPKG_HOST_TRIPLET=x64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=x64-linux-qt',
|
||||
]
|
||||
@@ -294,7 +293,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'visionos-developer-build'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Target os: 'IOS_ANY'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'Clang'
|
||||
@@ -306,7 +305,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24h2-mingw13'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'Mingw'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
|
||||
@@ -319,7 +318,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-llvm'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples'
|
||||
@@ -332,7 +331,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-mingw13-developer-build'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'Mingw'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples'
|
||||
|
||||
@@ -3,7 +3,7 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-minimal-static-test'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'Packaging', 'UseConfigure', 'MinimalStaticTests']
|
||||
Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql'
|
||||
@@ -67,13 +67,13 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'macos-14-minimal-static-tests-x86_64'
|
||||
Template: 'qtci-macos-14-x86_64-106'
|
||||
Template: 'qtci-macos-14-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
|
||||
-
|
||||
Id: 'macos-14-minimal-static-tests-arm64'
|
||||
Template: 'qtci-macos-14-arm-108'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-x86_64-minimal-static-test'
|
||||
|
||||
@@ -13,7 +13,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-minimal-static'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure']
|
||||
Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer'
|
||||
|
||||
@@ -17,7 +17,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'android-armv7-on-windows'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'Mingw'
|
||||
@@ -69,22 +69,3 @@ Configurations:
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_64_api_36'
|
||||
]
|
||||
-
|
||||
Id: 'android-17-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.6'
|
||||
Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'JavaDocs', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
# We check QT_USE_TARGET_ANDROID_BUILD_DIR and QT_USE_ANDROID_MODERN_BUNDLE only in one
|
||||
# configuration, to ensure builds without this option work too.
|
||||
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}',
|
||||
'ANDROID_EMULATOR=emulator_x86_64_api_37'
|
||||
]
|
||||
|
||||
@@ -28,7 +28,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'webassembly-windows'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'Mingw'
|
||||
Target compiler: 'Clang'
|
||||
|
||||
@@ -9,7 +9,7 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'macos-universal-on-arm64'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Target arch: 'x86_64-arm64'
|
||||
Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
@@ -31,7 +31,7 @@ Configurations:
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-14-x86_64-tests'
|
||||
Template: 'qtci-macos-14-x86_64-106'
|
||||
Template: 'qtci-macos-14-x86_64-105'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
@@ -46,25 +46,25 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'macos-13-arm64-tests'
|
||||
Template: 'qtci-macos-13-arm-108'
|
||||
Template: 'qtci-macos-13-arm-107'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-14-arm64-tests'
|
||||
Template: 'qtci-macos-14-arm-108'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-15-arm64-tests'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
-
|
||||
Id: 'macos-26-arm64-tests'
|
||||
Template: 'qtci-macos-26-arm-105'
|
||||
Template: 'qtci-macos-26-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-universal-on-arm64'
|
||||
@@ -87,7 +87,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'macos-arm64-developer-build'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
||||
@@ -97,7 +97,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'macos-26-arm64-developer-build'
|
||||
Template: 'qtci-macos-26-arm-105'
|
||||
Template: 'qtci-macos-26-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'Insignificant']
|
||||
Configure arguments: '-developer-build -nomake examples -debug -framework'
|
||||
@@ -109,25 +109,25 @@ Configurations:
|
||||
# Test on all supported macOS versions (deployment targets)
|
||||
-
|
||||
Id: 'macos-13-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-13-arm-108'
|
||||
Template: 'qtci-macos-13-arm-107'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly']
|
||||
Platform dependency: 'macos-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-14-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-14-arm-108'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly']
|
||||
Platform dependency: 'macos-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-15-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly']
|
||||
Platform dependency: 'macos-arm64-developer-build'
|
||||
-
|
||||
Id: 'macos-26-arm64-developer-build-tests'
|
||||
Template: 'qtci-macos-26-arm-105'
|
||||
Template: 'qtci-macos-26-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
|
||||
Platform dependency: 'macos-26-arm64-developer-build'
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-developer-build-cxx23'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples']
|
||||
Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++23'
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
Version: 2
|
||||
Module only: True
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'ubuntu-22.04'
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'ubuntu-22.04-Axivion'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['UseConfigure', 'VMSize16', 'RunAsPlatformDependency', 'PysideAxivion']
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
@@ -7,7 +7,7 @@ Include: [
|
||||
Configurations:
|
||||
-
|
||||
Id: 'qnx-710-arm64-on-windows'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'Mingw'
|
||||
|
||||
@@ -2,14 +2,11 @@ Version: 2
|
||||
Module only: True
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'ubuntu-22.04'
|
||||
"ubuntu-22.04"
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
Configurations: []
|
||||
Overrides:
|
||||
-
|
||||
Id: 'ubuntu-22.04-Axivion'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['UseConfigure', 'VMSize16', 'TestOnly']
|
||||
Environment variables: ['AXIVION_ANALYSIS=1']
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Id: 'ubuntu-22.04'
|
||||
Features: ['Axivion', 'DisableTests', 'UseConfigure', 'VMSize16']
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
Version: 2
|
||||
Module only: True
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'ubuntu-24.04-x64'
|
||||
]
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'imx8-arm64-developer-build-2404'
|
||||
Template: 'qtci-linux-Ubuntu-24.04-x86_64-50'
|
||||
Target os: 'IMX8'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-24.04-x64'
|
||||
Features: ['Elinux', 'Sccache', 'UseConfigure', 'DoNotAbortTestingOnFirstFailure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE=/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux-" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE="/opt/b2qt/imx8qm/sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" -DQT_FORCE_BUILD_TOOLS=ON -DQT_NO_PACKAGE_VERSION_INCOMPATIBLE_WARNING=TRUE',
|
||||
'QT_YOCTO_ENVSETUP=/opt/b2qt/imx8qm/environment-setup-cortexa72-cortexa53-crypto-poky-linux',
|
||||
'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin',
|
||||
'QT_SYSROOT_FOR_RUNNING_TESTS=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux',
|
||||
'GST_PLUGIN_SCANNER=/opt/b2qt/imx8qm/sysroots/cortexa72-cortexa53-crypto-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
|
||||
'QT_QUICK_BACKEND=software',
|
||||
'VCPKG_HOST_TRIPLET=x64-linux-qt',
|
||||
'VCPKG_TARGET_TRIPLET=arm64-linux-qt'
|
||||
]
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-unity-build'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests']
|
||||
Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib'
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -21,14 +21,14 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
# without tests
|
||||
-
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'DisableTests']
|
||||
Configure arguments: ''
|
||||
@@ -36,7 +36,7 @@ Configurations:
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
# oldest Qt version
|
||||
-
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
@@ -55,7 +55,7 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
|
||||
@@ -13,6 +13,6 @@ Configurations:
|
||||
Features: ['TestOnly']
|
||||
-
|
||||
Id: 'qtgp-on-windows-24h2'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['TestOnly']
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'macos-quick-bridges'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
|
||||
Configure arguments: >
|
||||
@@ -46,7 +46,7 @@ Configurations:
|
||||
Environment variables: []
|
||||
-
|
||||
Id: 'windows-quick-bridges'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'Insignificant']
|
||||
Configure arguments: >
|
||||
|
||||
@@ -12,7 +12,7 @@ Include: [
|
||||
Configurations:
|
||||
-
|
||||
Id: 'macos-quick-minimal'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests', 'Insignificant']
|
||||
Configure arguments: >
|
||||
@@ -145,7 +145,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'macos-quick-minimal-tests'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'Insignificant']
|
||||
Platform dependency: 'macos-quick-minimal'
|
||||
@@ -293,7 +293,7 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'windows-11_24H2-msvc2022-static-quicklite'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Features: ['Sccache', 'UseConfigure', 'DisableTests', 'Insignificant']
|
||||
Configure arguments: >
|
||||
|
||||
@@ -34,7 +34,7 @@ Configurations:
|
||||
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
|
||||
]
|
||||
-
|
||||
Id: "automotive-android-12-x86_64-on-linux-rhel_9_6"
|
||||
Id: "automotive-android-10-x86_64-on-linux-rhel_9_6"
|
||||
Template: 'qtci-linux-RHEL-9.6-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
@@ -47,5 +47,5 @@ Configurations:
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
|
||||
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
|
||||
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29'
|
||||
]
|
||||
|
||||
@@ -12,28 +12,28 @@ Include: [
|
||||
Configurations:
|
||||
-
|
||||
Id: 'windows-quick-bridges-dotnet'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesDotnet']
|
||||
|
||||
-
|
||||
Id: 'windows-quick-bridges-rust'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesRust']
|
||||
|
||||
-
|
||||
Id: 'windows-quick-bridges-python'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
|
||||
|
||||
-
|
||||
Id: 'windows-quick-bridges-java'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-73'
|
||||
Template: 'qtci-windows-11_24H2-x86_64-71'
|
||||
Compiler: 'MSVC2022'
|
||||
Platform dependency: 'windows-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
|
||||
@@ -61,21 +61,21 @@ Configurations:
|
||||
|
||||
-
|
||||
Id: 'macos-quick-bridges-java'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesJava']
|
||||
|
||||
-
|
||||
Id: 'macos-quick-bridges-python'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesPython']
|
||||
|
||||
-
|
||||
Id: 'macos-quick-bridges-swift'
|
||||
Template: 'qtci-macos-15-arm-105'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Platform dependency: 'macos-quick-bridges'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'DisableTests', 'RunAsPlatformDependency', 'QtBridgesSwift']
|
||||
|
||||
@@ -12,5 +12,5 @@ Configurations:
|
||||
Template: 'qtci-linux-openSUSE-16.0-x86_64-51'
|
||||
Target os: 'WebAssembly'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure']
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Platform dependency: 'webassembly-linux-thread-asyncify-new'
|
||||
|
||||
Executable → Regular
Executable → Regular
Executable → Regular
Executable → Regular
@@ -63,9 +63,3 @@ https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/
|
||||
* Modify 'Windows Software Development Kit' from Add or remove programs
|
||||
- Add feature 'Debugging Tools for Windows'
|
||||
############################################################
|
||||
|
||||
Visual Studio 2026 and build tools were later updated to 17.14.33 in VS installer.
|
||||
This updated (Latest) MSVC components to:
|
||||
- MSVC v14.44.35211.0
|
||||
- Windows 11 SDK (10.0.26100.7705)
|
||||
.NET SDK was added
|
||||
|
||||
@@ -50,9 +50,9 @@ sdkApiLevelAutomotiveMax="android-34"
|
||||
androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
|
||||
androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519"
|
||||
# Android Automotive min SDK level image
|
||||
sdkApiLevelAutomotiveMin="android-31"
|
||||
sdkApiLevelAutomotiveMin="android-29"
|
||||
androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
|
||||
androidAutomotiveMinSha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
|
||||
androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f"
|
||||
|
||||
toolsTargetFile="/tmp/$toolsFile"
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
@@ -78,25 +78,18 @@ function InstallNdk() {
|
||||
ndkTargetFile="/tmp/$ndkFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
ndkTargetDir="$targetFolder/$ndkVersion"
|
||||
sudo mkdir -p "$ndkTargetDir"
|
||||
|
||||
DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
|
||||
echo "Unzipping Android NDK to '$ndkTargetDir'"
|
||||
echo "Unzipping Android NDK to '$targetFolder'"
|
||||
# Get the package base directory name as string
|
||||
zipBase=$(sudo zipinfo -1 "$ndkTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
|
||||
sudo unzip -q "$ndkTargetFile" -d "$ndkTargetDir"
|
||||
sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
|
||||
rm "$ndkTargetFile"
|
||||
androidNdkRoot="${ndkTargetDir}/${zipBase}"
|
||||
androidNdkRoot="${targetFolder}/${zipBase}"
|
||||
}
|
||||
|
||||
InstallNdk $ndkVersionLatest $ndkSha1Latest
|
||||
SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot"
|
||||
|
||||
# To be used by vcpkg
|
||||
SetEnvVar "ANDROID_NDK_HOME" "$androidNdkRoot"
|
||||
export ANDROID_NDK_HOME="$androidNdkRoot"
|
||||
|
||||
if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
|
||||
InstallNdk $ndkVersionPreview $ndkSha1Preview
|
||||
SetEnvVar "ANDROID_NDK_ROOT_PREVIEW" "$androidNdkRoot"
|
||||
@@ -112,6 +105,10 @@ if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
|
||||
SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot"
|
||||
fi
|
||||
|
||||
# To be used by vcpkg
|
||||
SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionLatest"
|
||||
export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionLatest"
|
||||
|
||||
echo "Changing ownership of Android files."
|
||||
if uname -a |grep -q "el7"; then
|
||||
sudo chown -R qt:wheel "$targetFolder"
|
||||
@@ -202,23 +199,6 @@ echo "Unzipping the Android 16 to $maxVersionDestination"
|
||||
sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
|
||||
rm "$maxVersionFilePath"
|
||||
|
||||
echo "Download and unzip Android 17 Beta 3 16KB System Image"
|
||||
insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
|
||||
insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-37/google_apis_ps16k/"
|
||||
insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
|
||||
insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"
|
||||
|
||||
mkdir -p "$insignificantMaxVersionDestination"
|
||||
DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
|
||||
|
||||
echo "Unzipping the Android 17 Beta3 16KB to $insignificantMaxVersionDestination"
|
||||
sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
|
||||
# Hack to avoid SDK version bug in source.properties file, the usage of ".0" messes things for avdmanager. TODO: undo when official comes
|
||||
sudo sed -i 's/AndroidVersion.ApiLevel=37.0/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
|
||||
rm "$insignificantMaxVersionFilePath"
|
||||
|
||||
echo "Checking the contents of Android SDK again..."
|
||||
ls -l "$sdkTargetFolder"
|
||||
|
||||
@@ -228,9 +208,6 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
|
||||
-k "system-images;android-36;google_apis;x86_64"
|
||||
|
||||
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_37 -c 2048M -f \
|
||||
-k "system-images;android-37;google_apis,page_size_16kb,ai_glasses_compatible;x86_64"
|
||||
|
||||
echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
|
||||
DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \
|
||||
"/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
|
||||
@@ -242,7 +219,7 @@ echo "Install minimum supported SDK level image for Android Automotive $sdkApiLe
|
||||
DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \
|
||||
"/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
|
||||
sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images
|
||||
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
|
||||
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048M -f \
|
||||
-k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"
|
||||
|
||||
# Purely informative, show the list of avd devices
|
||||
|
||||
@@ -22,9 +22,6 @@
|
||||
"_active": true,
|
||||
"excludes": [
|
||||
"$(splitpath:EXCLUDE_FILES)"
|
||||
],
|
||||
"includes": [
|
||||
"$(splitpath:INCLUDE_FILES)"
|
||||
]
|
||||
},
|
||||
"Frameworks-QtSupport": {
|
||||
@@ -275,17 +272,14 @@
|
||||
"Stylechecks": {
|
||||
"excludes": [
|
||||
"$(splitpath:EXCLUDE_FILES)"
|
||||
],
|
||||
"includes": [
|
||||
"$(splitpath:INCLUDE_FILES)"
|
||||
]
|
||||
}
|
||||
},
|
||||
"_Format": "1.0",
|
||||
"_VersionNum": [
|
||||
7,
|
||||
11,
|
||||
5,
|
||||
19102
|
||||
10,
|
||||
4,
|
||||
17655
|
||||
]
|
||||
}
|
||||
|
||||
@@ -10,22 +10,4 @@ export EXCLUDE_FILES="build/*:src/3rdparty/*"
|
||||
export MODULE=$TESTED_MODULE_COIN
|
||||
export PACKAGE="Add-ons"
|
||||
export IRNAME=build/$TESTED_MODULE_COIN.ir
|
||||
|
||||
ROOT_DIR=src
|
||||
MAGIC="Qt-Security score:critical"
|
||||
|
||||
INCLUDE_FILES=""
|
||||
|
||||
while IFS= read -r file; do
|
||||
if [ -z "$INCLUDE_FILES" ]; then
|
||||
INCLUDE_FILES="$file"
|
||||
else
|
||||
INCLUDE_FILES="$INCLUDE_FILES:$file"
|
||||
fi
|
||||
done <<EOF
|
||||
$(grep -rl "$MAGIC" "$ROOT_DIR")
|
||||
EOF
|
||||
|
||||
export INCLUDE_FILES
|
||||
|
||||
axivion_ci "$@"
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
diffutils
|
||||
make
|
||||
yasm
|
||||
@@ -1,4 +0,0 @@
|
||||
diffutils
|
||||
libva-devel
|
||||
make
|
||||
yasm
|
||||
@@ -1,3 +0,0 @@
|
||||
diffutils
|
||||
make
|
||||
yasm
|
||||
@@ -1,4 +0,0 @@
|
||||
diffutils
|
||||
libva-dev
|
||||
make
|
||||
yasm
|
||||
Executable → Regular
Executable → Regular
Executable → Regular
@@ -21,13 +21,13 @@ prefix="${2:-$default_prefix}"
|
||||
pkgconfig_path="$PKG_CONFIG_PATH"
|
||||
|
||||
install_ff_nvcodec_headers() {
|
||||
local nv_codec_version="11.1.5.3" # use 11.x.x.x to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
|
||||
local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n$nv_codec_version.zip"
|
||||
local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-$nv_codec_version.zip"
|
||||
local nv_codec_sha1="78715d521de102362e553dc92577bbe81905a321"
|
||||
local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0
|
||||
local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip"
|
||||
local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip"
|
||||
local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e"
|
||||
#nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0
|
||||
local target_dir="$HOME"
|
||||
local nv_codec_dir="$target_dir/nv-codec-headers-n$nv_codec_version"
|
||||
local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version"
|
||||
|
||||
if [ ! -d "$nv_codec_dir" ]; then
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
echo "Installing vcpkg android ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86-android-qt --x-install-root x86-android-qt-tmp --debug
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x86_64-android-qt --x-install-root x86_64-android-qt-tmp --debug
|
||||
|
||||
|
||||
+4
-5
@@ -7,11 +7,12 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
echo "Installing vcpkg ports"
|
||||
|
||||
pushd "${BASH_SOURCE%/*}/../shared/vcpkg" || exit
|
||||
pushd "${BASH_SOURCE%/*}/vcpkg" || exit
|
||||
cp "${BASH_SOURCE%/*}/../shared/vcpkg-configuration.json" .
|
||||
|
||||
install_root=$1-tmp
|
||||
install_root=x64-linux-qt-tmp
|
||||
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet $1 --x-install-root $install_root --debug
|
||||
"$VCPKG_ROOT/vcpkg" install --triplet x64-linux-qt --x-install-root $install_root --debug
|
||||
|
||||
cmake "-DVCPKG_EXECUTABLE=$VCPKG_ROOT/vcpkg"\
|
||||
"-DVCPKG_INSTALL_ROOT=$PWD/$install_root"\
|
||||
@@ -25,7 +26,5 @@ cp -R $install_root/* "$VCPKG_ROOT/installed/"
|
||||
SetEnvVar "VCPKG_INSTALLED_DIR" "$VCPKG_ROOT/installed/"
|
||||
|
||||
rm -rf $install_root
|
||||
rm -rf "$VCPKG_ROOT/buildtrees/"
|
||||
rm -rf "$VCPKG_ROOT/packages/"
|
||||
|
||||
popd || exit
|
||||
+2
-2
@@ -34,7 +34,7 @@ do
|
||||
"vcpkg_tool_release_tag")
|
||||
vcpkgToolReleaseTag=${keyValue[1]}
|
||||
;;
|
||||
"unix_checksum")
|
||||
"linux_checksum")
|
||||
vcpkgToolChecksum=${keyValue[1]}
|
||||
;;
|
||||
esac
|
||||
@@ -86,7 +86,7 @@ SetEnvVar "VCPKG_ROOT" "$vcpkgRoot"
|
||||
export VCPKG_ROOT="$vcpkgRoot"
|
||||
|
||||
# Set a source for vcpkg Binary and Asset Cache
|
||||
# The `coin/provisioning/common/<platform>/mount-vcpkg-cache-drive.sh` script is
|
||||
# The `coin/provisioning/common/linux/mount-vcpkg-cache-drive.sh` script is
|
||||
# mounting the SMB share located in `vcpkg-server.ci.qt.io/vcpkg` to
|
||||
# $HOME/vcpkg-cache/
|
||||
export VCPKG_BINARY_SOURCES="files,$HOME/vcpkg-cache/binaries,readwrite"
|
||||
@@ -13,7 +13,7 @@ QEMU_VER="8.2.3"
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/qemu/qemu-$QEMU_VER.tar.xz"
|
||||
AltUrl="https://download.qemu.org/qemu-$QEMU_VER.tar.xz"
|
||||
SHA1="1b29c8105cf8d15b9e7fb6f8e85170b6c54a1788"
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" ""
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "/tmp" "$appPrefix"
|
||||
|
||||
targetFolder=/tmp/qemu-${QEMU_VER}
|
||||
mkdir -p "$targetFolder/build"
|
||||
|
||||
@@ -43,17 +43,9 @@ if [ ! -d "$targetFolder" ]; then
|
||||
fi
|
||||
|
||||
# QNX SDP
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20250612.tar.xz"
|
||||
targetFile="qnx800.tar.xz"
|
||||
sha1="a3fdcd98e12bc5054d00f18e4088af26288fd020"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
|
||||
|
||||
# IANA timezone database overlay. Packaged separately from the SDP so it can be
|
||||
# bumped without rebuilding the SDP tarball. Archive root is qnx800/target/qnx/
|
||||
# so it overlays onto $targetFolder (/opt/) directly.
|
||||
sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a.tar.xz"
|
||||
targetFile="zoneinfo.tar.xz"
|
||||
sha1="8c1678ff673bb588f63fc9277497cd38e0ea2253"
|
||||
sha1="d7ca20be6867b569067a17e8b3fa633c7eadad89"
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
|
||||
|
||||
sudo cp "$aarch64le_toolchain" "$targetPath"
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
# Loopback — the QNX SDP's default /etc/hosts ships these, but this
|
||||
# file overrides that default. Tests that connect to http(s)://localhost
|
||||
# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
|
||||
# Need to add all testserver names statically
|
||||
# as current Docker uses Multicast DNS (mDNS) (avahi)
|
||||
# Which does not work with QNX qemu
|
||||
|
||||
@@ -1,9 +1,3 @@
|
||||
# Loopback — the QNX SDP's default /etc/hosts ships these, but this
|
||||
# file overrides that default. Tests that connect to http(s)://localhost
|
||||
# (e.g. tst_qhttpserver, tst_abstractoauth2) need them present.
|
||||
127.0.0.1 localhost
|
||||
::1 localhost
|
||||
|
||||
# Need to add all testserver names statically
|
||||
# as current Docker uses Multicast DNS (mDNS) (avahi)
|
||||
# Which does not work with QNX qemu
|
||||
|
||||
+2
-2
@@ -22,7 +22,7 @@ lib/libEGL.so.1=usr/lib/libEGL.so.1
|
||||
lib/libz.so.2=usr/lib/libz.so.2
|
||||
lib/libzstd.so.1=usr/lib/libzstd.so.1
|
||||
lib/libxml2.so.2=usr/lib/libxml2.so.2
|
||||
lib/libfreetype.so.26=usr/lib/libfreetype.so.26
|
||||
lib/libfreetype.so.24=usr/lib/libfreetype.so.24
|
||||
lib/libbz2.so.1=usr/lib/libbz2.so.1
|
||||
lib/liblzma.so.5=usr/lib/liblzma.so.5
|
||||
lib/libdbus-1.so=usr/lib//libdbus-1.so
|
||||
@@ -54,7 +54,7 @@ xbin/fsevmgr=sbin/fsevmgr
|
||||
lib/libscreen.so.1=usr/lib/libscreen.so.1
|
||||
|
||||
# for fontconfig
|
||||
lib/libfontconfig.so.17=usr/lib/libfontconfig.so.17
|
||||
lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
|
||||
xbin/fc-cache=bin/fc-cache
|
||||
xbin/fc-match=local/misc_files/fc-match
|
||||
|
||||
|
||||
@@ -6,13 +6,13 @@ set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
||||
|
||||
targetVersion=v0.15.0
|
||||
targetVersion=v0.11.0
|
||||
if [[ $(uname -m) == 'aarch64' ]]; then
|
||||
targetArch=aarch64-unknown-linux-musl
|
||||
sha256=3a6a3712b49da3d263bf2d30d702de4302793016019e800bfb81c0c69401d8f8
|
||||
sha1=b7606d0fb461c0aa7351f511d9223416a322d52a
|
||||
else
|
||||
targetArch=x86_64-unknown-linux-musl
|
||||
sha256=782d2b5dd7ae0a55ebe368ab258114d0928d019ac2d949ab85d5d02f3926709e
|
||||
sha1=ef389a20c85b732cccd48436a5e28ed40bed2806
|
||||
fi
|
||||
|
||||
installSccache "$targetArch" "$targetVersion" "$sha256"
|
||||
installSccache "$targetArch" "$targetVersion" "$sha1"
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2026 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 Syft
|
||||
|
||||
# Syft is used for generating SBOM (Software Bill of Materials) files.
|
||||
|
||||
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
|
||||
version="1.45.1"
|
||||
|
||||
uname_m="$(uname -m)"
|
||||
case "$uname_m" in
|
||||
x86_64|amd64)
|
||||
SHA1="06e1d56173209977df8b11ad955843cb62f874fd"
|
||||
arch="amd64"
|
||||
;;
|
||||
arm64|aarch64)
|
||||
SHA1="c48638b3998066dbd139e94e116a81a6cc6299be"
|
||||
arch="arm64"
|
||||
;;
|
||||
*) fatal "Unknown architecture in uname: $uname_m" 43 ;;
|
||||
esac
|
||||
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_linux_${arch}.tar.gz"
|
||||
AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_linux_${arch}.tar.gz"
|
||||
targetFolder="/opt/syft-$version"
|
||||
appPrefix=""
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
SetEnvVar "PATH" "$targetFolder:\$PATH"
|
||||
|
||||
echo "Syft = $version" >> ~/versions.txt
|
||||
@@ -1,20 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2026 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 verifies that all installed packages originate from the current release version and not from newer releases.
|
||||
# The caller provides a regex that matches the allowed release version and excludes packages from newer releases.
|
||||
|
||||
set -ex
|
||||
|
||||
verify_release_packages() {
|
||||
local regex_verify="$1"
|
||||
|
||||
if rpm -qa --queryformat="%{NAME} %{RELEASE}\n" | grep -E " .*$regex_verify" >/dev/null; then
|
||||
echo "Found packages that belong to other RHEL release, aborting"
|
||||
exit 1
|
||||
else
|
||||
echo "All package versions checked OK"
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -69,16 +69,13 @@ function InstallNdk() {
|
||||
ndkTargetFile="/tmp/$ndkFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
ndkTargetDir="$targetFolder/$ndkVersion"
|
||||
sudo mkdir -p "$ndkTargetDir"
|
||||
|
||||
DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
|
||||
echo "Unzipping Android NDK to '$ndkTargetDir'"
|
||||
echo "Unzipping Android NDK to '$targetFolder'"
|
||||
# Get the package base directory name as string
|
||||
zipBase=$(sudo zipinfo -1 "$ndkTargetFile" 2>/dev/null | awk '!seen {sub("/.*",""); print; seen=1}')
|
||||
sudo unzip -q "$ndkTargetFile" -d "$ndkTargetDir"
|
||||
sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
|
||||
rm "$ndkTargetFile"
|
||||
androidNdkRoot="${ndkTargetDir}/${zipBase}"
|
||||
androidNdkRoot="${targetFolder}/${zipBase}"
|
||||
}
|
||||
|
||||
InstallNdk $ndkVersionLatest $ndkSha1Latest
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
diffutils
|
||||
yasm
|
||||
@@ -26,14 +26,9 @@ readonly MINIMUM_IOS_VERSION="16.0"
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh"
|
||||
|
||||
ffmpeg_version=$(ffmpeg_version_default)
|
||||
ffmpeg_source_dir=$(download_ffmpeg)
|
||||
ffmpeg_version="n$(<"${ffmpeg_source_dir}/RELEASE")"
|
||||
if [ ! -n "$ffmpeg_version" ]; then
|
||||
echo "Error. Unable to determine FFmpeg version."
|
||||
exit 1
|
||||
fi
|
||||
ffmpeg_build_type="shared"
|
||||
ffmpeg_config_options=$(get_ffmpeg_config_options "$ffmpeg_build_type")
|
||||
ffmpeg_config_options=$(get_ffmpeg_config_options "shared")
|
||||
default_prefix="/usr/local/ios/ffmpeg"
|
||||
prefix="${1:-$default_prefix}"
|
||||
|
||||
@@ -101,6 +96,8 @@ build_ffmpeg_ios() {
|
||||
--extra-cxxflags="${common_arch_flags}"
|
||||
--extra-ldflags="${common_arch_flags}"
|
||||
--target-os=darwin
|
||||
--enable-shared
|
||||
--disable-static
|
||||
--install-name-dir="@rpath"
|
||||
--disable-audiotoolbox
|
||||
|
||||
|
||||
@@ -41,11 +41,7 @@ build_ffmpeg() {
|
||||
popd
|
||||
}
|
||||
|
||||
# Install required packages through Brew
|
||||
required_ffmpeg_packages=()
|
||||
while IFS= read -r line; do required_ffmpeg_packages+=("$line"); done < "${BASH_SOURCE%/*}/../macos/ffmpeg_required_brew_packages.txt"
|
||||
brew install "${required_ffmpeg_packages[@]}"
|
||||
|
||||
brew install yasm
|
||||
export MACOSX_DEPLOYMENT_TARGET=12
|
||||
fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh"
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ class Libiodbc < Formula
|
||||
|
||||
def install
|
||||
if build.with? "universal"
|
||||
ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9 -std=gnu89'
|
||||
ENV['CFLAGS'] = '-O -arch arm64 -arch x86_64 -mmacosx-version-min=10.9'
|
||||
end
|
||||
system "./autogen.sh"
|
||||
system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}"
|
||||
|
||||
Executable
+35
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
# 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 libusb
|
||||
set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
brew install libusb
|
||||
read -r -a arr <<< "$(brew list --versions libusb)"
|
||||
version=${arr[1]}
|
||||
echo "libusb = $version" >> ~/versions.txt
|
||||
|
||||
mkdir /tmp/arm64/
|
||||
mkdir /tmp/amd64/
|
||||
|
||||
case $(sw_vers -productVersion) in
|
||||
11*) codename=big_sur;;
|
||||
12*) codename=monterey;;
|
||||
13*) codename=ventura;;
|
||||
14*) codename=sonoma;;
|
||||
esac
|
||||
|
||||
brew fetch --bottle-tag=arm64_"${codename}" libusb
|
||||
brew fetch --bottle-tag="${codename}" libusb
|
||||
tar xf "$(brew --cache --bottle-tag=arm64_"${codename}" libusb)" -C /tmp/arm64/
|
||||
tar xf "$(brew --cache --bottle-tag="${codename}" libusb)" -C /tmp/amd64
|
||||
for f in /tmp/arm64/libusb/"$version"/lib/* ; do
|
||||
if lipo -info "$f" >/dev/null 2>&1; then
|
||||
file="$(basename "$f")"
|
||||
lipo -create -output "$(brew --cellar)/libusb/$version/lib/$file" \
|
||||
"/tmp/arm64/libusb/$version/lib/$file" \
|
||||
"/tmp/amd64/libusb/$version/lib/$file"
|
||||
fi
|
||||
done
|
||||
@@ -6,12 +6,12 @@ set -ex
|
||||
|
||||
source "${BASH_SOURCE%/*}/../unix/sccache.sh"
|
||||
|
||||
targetVersion=v0.15.0
|
||||
targetVersion=v0.11.0
|
||||
if [[ `arch` == arm* ]]; then
|
||||
targetArch=aarch64-apple-darwin
|
||||
sha256=430ef7b5f54256d3ed5bfe77e8b0afc51aa209aeebe4f95b69c3a52ce3acc6e9
|
||||
sha1=3261ab99e5bb1f9f36eafa597d11491bd85da5ec
|
||||
else
|
||||
targetArch=x86_64-apple-darwin
|
||||
sha256=f8da93e0689122268f720ddb48c8357f3da18be8c88aff23a8e75a7a219367db
|
||||
sha1=57810789bf2813dfa9bf5da26a712dc30b56ce16
|
||||
fi
|
||||
installSccache "$targetArch" "$targetVersion" "$sha256"
|
||||
installSccache "$targetArch" "$targetVersion" "$sha1"
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2026 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 Syft
|
||||
|
||||
# Syft is used for generating SBOM (Software Bill of Materials) files.
|
||||
|
||||
# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
|
||||
version="1.45.1"
|
||||
|
||||
uname_m="$(uname -m)"
|
||||
case "$uname_m" in
|
||||
x86_64|amd64)
|
||||
SHA1="ecd1a9283e4ce025b5905a85e505fcba237edd51"
|
||||
arch="amd64"
|
||||
;;
|
||||
arm64|aarch64)
|
||||
SHA1="996f3985f14ebbe8661c0b72d7ad520200155c46"
|
||||
arch="arm64"
|
||||
;;
|
||||
*) fatal "Unknown architecture in uname: $uname_m" 43 ;;
|
||||
esac
|
||||
|
||||
PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/syft/syft_${version}_darwin_${arch}.tar.gz"
|
||||
AltUrl="https://github.com/anchore/syft/releases/download/v${version}/syft_${version}_darwin_${arch}.tar.gz"
|
||||
targetFolder="/opt/syft-$version"
|
||||
appPrefix=""
|
||||
|
||||
InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
|
||||
|
||||
SetEnvVar "PATH" "$targetFolder:\$PATH"
|
||||
|
||||
echo "Syft = $version" >> ~/versions.txt
|
||||
@@ -1 +1 @@
|
||||
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1 --disable-avdevice --disable-avfilter
|
||||
--disable-programs --disable-doc --disable-debug --enable-network --disable-lzma --enable-pic --disable-vulkan --disable-v4l2-m2m --disable-decoder=truemotion1
|
||||
|
||||
@@ -8,27 +8,25 @@ lib_dir="$1/lib"
|
||||
additional_suffix="${2:-}"
|
||||
set_rpath="${3:-yes}"
|
||||
page_size="${4:-}"
|
||||
custom_readelf="${5:-""}"
|
||||
|
||||
# If custom_readelf is not provided, we fallback to host readelf.
|
||||
if [ -n "$custom_readelf" ]; then
|
||||
if ! command -v "$custom_readelf"; then
|
||||
echo "Error. Provided readelf executable '${custom_readelf}' is not a valid executable"
|
||||
# readelf and patchelf are prerequisite tools for this script. Check
|
||||
# that they are available.
|
||||
if [ "$(uname -s)" = "Darwin" ]; then
|
||||
# Under Homebrew, binutils package is not symlinked into PATH.
|
||||
# This lets us use readelf provided by Homebrew.
|
||||
readelf_homebrew_path="$(brew --prefix binutils)/bin/readelf"
|
||||
if [[ ! -x "$readelf_homebrew_path" ]]; then
|
||||
echo "Found no valid readelf executable. It is possible it was not correctly installed through Homebrew."
|
||||
exit 1
|
||||
fi
|
||||
elif ! command -v readelf; then
|
||||
readelf() { "$readelf_homebrew_path" "$@"; }
|
||||
fi
|
||||
|
||||
if ! command -v readelf; then
|
||||
echo "Found no valid readelf command. It is possible it was not correctly installed."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
readelf_wrapper() {
|
||||
if [ -n "$custom_readelf" ]; then
|
||||
"$custom_readelf" "$@"
|
||||
else
|
||||
readelf "$@"
|
||||
fi
|
||||
}
|
||||
|
||||
if ! command -v patchelf; then
|
||||
echo "Found no valid patchelf command. It is possible it was not correctly installed."
|
||||
exit 1
|
||||
@@ -40,7 +38,7 @@ if [[ "$patchelf_version" == "0.18.0" ]]; then
|
||||
echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2
|
||||
fi
|
||||
|
||||
ffmpeg_libs=("avcodec" "avformat" "avutil" "swresample" "swscale")
|
||||
ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale")
|
||||
stub_prefix="Qt6FFmpegStub-"
|
||||
|
||||
for lib_name in "${ffmpeg_libs[@]}"; do
|
||||
@@ -59,7 +57,7 @@ for lib_name in "${ffmpeg_libs[@]}"; do
|
||||
fi
|
||||
|
||||
read_needed_deps() {
|
||||
readelf_wrapper -d "$lib_path" | grep '(NEEDED)'
|
||||
readelf -d "$lib_path" | grep '(NEEDED)'
|
||||
}
|
||||
|
||||
while read -r line; do
|
||||
|
||||
+2
-2
@@ -2,8 +2,8 @@
|
||||
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
|
||||
"default-registry": {
|
||||
"kind": "git",
|
||||
"repository": "https://git.qt.io/qtbuildsystem/vcpkg",
|
||||
"repository": "https://git.qt.io/aledelev/vcpkg",
|
||||
"baseline": "9c5c2a0ab75aff5bcd08142525f6ff7f6f7ddeee"
|
||||
},
|
||||
"overlay-triplets": [ "./../triplets" ]
|
||||
"overlay-triplets": [ "./../../shared/triplets" ]
|
||||
}
|
||||
@@ -1 +1,2 @@
|
||||
https://git.qt.io/qtbuildsystem/vcpkg.git
|
||||
https://git.qt.io/aledelev/vcpkg.git
|
||||
https://git.qt.io/mrmsdbdl/vcpkg-mirror.git
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
vcpkg_tool_release_tag=2025-09-03
|
||||
windows_x64_checksum=4523B5B2CE77BD0F6DCA55140D831EA6EB03046D5F4496C85DF94AC1A7EFAB01
|
||||
windows_arm64_checksum=1E8653243C0E7D73FF1F0F3F25A55C8154888F331510F9545AD200EDD3CCB962
|
||||
unix_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
|
||||
linux_checksum=f0c4b30afc2f7baa9cc4372ac325042418251343e0192dbfac94c4f602e9d3ed
|
||||
|
||||
@@ -2,8 +2,12 @@
|
||||
# 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
|
||||
|
||||
ffmpeg_version_default() {
|
||||
echo "n7.1.3"
|
||||
}
|
||||
|
||||
download_ffmpeg() {
|
||||
local version="${1:-"n7.1.3"}"
|
||||
local version="${1:-$(ffmpeg_version_default)}"
|
||||
local sha1="${2:-27051817deec88bed3b9652d49f9127d22268d83}"
|
||||
|
||||
local ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
@@ -124,14 +124,8 @@ build_ffmpeg_android() {
|
||||
if [ $page_size == "use_16kb_page_size" ]; then
|
||||
page_size_arg="16384"
|
||||
fi
|
||||
local set_rpath_arg="no"
|
||||
local readelf_path_arg="${toolchain_bin}/llvm-readelf"
|
||||
sudo "$fix_dependencies" \
|
||||
"$target_dir" \
|
||||
"$libs_prefix" \
|
||||
"$set_rpath_arg" \
|
||||
"$page_size_arg" \
|
||||
"$readelf_path_arg"
|
||||
|
||||
sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" "$page_size_arg"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
@@ -9,19 +9,19 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
# shellcheck source=./SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
|
||||
# This script will install go 1.26.2
|
||||
version="1.26.2"
|
||||
# This script will install go 1.25.2
|
||||
version="1.25.2"
|
||||
|
||||
if [[ "$os" == "linux" ]]; then
|
||||
uname_m="$(uname -m)"
|
||||
case "$uname_m" in
|
||||
x86_64|amd64)
|
||||
sha256="990e6b4bbba816dc3ee129eaeaf4b42f17c2800b88a2166c265ac1a200262282"
|
||||
sha256="a08c8c36946c86890ca46185765da34442ce64aa"
|
||||
pkgname="go$version.linux-amd64.tar.gz"
|
||||
dirname="go$version.linux-amd64"
|
||||
;;
|
||||
arm64|aarch64)
|
||||
sha256="c958a1fe1b361391db163a485e21f5f228142d6f8b584f6bef89b26f66dc5b23"
|
||||
sha256="13690a4ecac03e6cca6988a6d2ce80bfa938eb7b"
|
||||
pkgname="go$version.linux-arm64.tar.gz"
|
||||
dirname="go$version.linux-arm64"
|
||||
;;
|
||||
@@ -31,12 +31,12 @@ elif [ "$os" == "macos" ]; then
|
||||
uname_m="$(uname -m)"
|
||||
case "$uname_m" in
|
||||
x86_64|amd64)
|
||||
sha256="bc3f1500d9968c36d705442d90ba91addf9271665033748b82532682e90a7966"
|
||||
sha256="eda89df8fd85a49e4046f85340236248a5d2a7cd"
|
||||
pkgname="go$version.darwin-amd64.tar.gz"
|
||||
dirname="go$version.darwin-amd64"
|
||||
;;
|
||||
arm64|aarch64)
|
||||
sha256="32af1522bf3e3ff3975864780a429cc0b41d190ec7bf90faa661d6d64566e7af"
|
||||
sha256="1745a71d18f9946f7aac9f9528e3227c8132cc08"
|
||||
pkgname="go$version.darwin-arm64.tar.gz"
|
||||
dirname="go$version.darwin-arm64"
|
||||
;;
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2022 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 install OpenSSL from sources.
|
||||
# Requires GCC and Perl to be in PATH.
|
||||
set -ex
|
||||
os="$1"
|
||||
version=${2:-"3.5.4"}
|
||||
sha=${3:-"b75daac8e10f189abe28a076ba5905d363e4801f"}
|
||||
version=${2:-"3.0.7"}
|
||||
sha=${3:-"f20736d6aae36bcbfa9aba0d358c71601833bf27"}
|
||||
|
||||
SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
@@ -104,18 +104,6 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
|
||||
SetEnvVar "OPENSSL_INCLUDE" "\"$openssl_install_dir/include\""
|
||||
SetEnvVar "OPENSSL_LIB" "\"$openssl_install_dir/lib\""
|
||||
|
||||
# Set runtime loader (dyld) and OpenSSL providers for SSL tests (QTBUG-142392)
|
||||
SetEnvVar "DYLD_LIBRARY_PATH" "\"$opensslTargetLocation/lib:\$DYLD_LIBRARY_PATH\""
|
||||
SetEnvVar "OPENSSL_MODULES" "\"$opensslTargetLocation/lib/ossl-modules\""
|
||||
# Check that the versioned dylibs exists and ML-DSA is available
|
||||
test -f "$opensslTargetLocation/lib/libcrypto.3.dylib"
|
||||
test -f "$opensslTargetLocation/lib/libssl.3.dylib"
|
||||
test -d "$opensslTargetLocation/lib/ossl-modules"
|
||||
|
||||
OPENSSL_MODULES="$opensslTargetLocation/lib/ossl-modules" \
|
||||
"$opensslTargetLocation/bin/openssl" list -signature-algorithms | \
|
||||
grep -q -i 'ML-DSA' || { echo "ML-DSA not available"; exit 1; }
|
||||
|
||||
security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
|
||||
security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a "$opensslTargetLocation/ssl/cert.pem" > /dev/null
|
||||
fi
|
||||
|
||||
@@ -1,112 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2026 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 will build and install rust toolchain
|
||||
set -ex
|
||||
|
||||
PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||
|
||||
# shellcheck source=./../unix/common.sourced.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/common.sourced.sh"
|
||||
# shellcheck source=./../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=./../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.92.0"
|
||||
sourceName="rustc-$version-src"
|
||||
sourceFile="$sourceName.tar.xz"
|
||||
cachedUrl="http://ci-files01-hki.ci.qt.io/input/rust/$sourceFile"
|
||||
officialUrl="https://static.rust-lang.org/dist/$sourceFile"
|
||||
sourcesSHA256="ebee170bfe4c4dfc59521a101de651e5534f4dae889756a5c97ca9ea40d0c307"
|
||||
|
||||
function BuildRust() {
|
||||
buildFolder=$1
|
||||
installPrefix=$2
|
||||
target=$3
|
||||
channel=$4
|
||||
outputTarball=$5
|
||||
tmpFolder=$6
|
||||
|
||||
targetFile=$tmpFolder/$sourceFile
|
||||
srcFolder=$tmpFolder/$sourceName
|
||||
|
||||
if [ ! -d "$srcFolder" ]; then
|
||||
DownloadURL $cachedUrl $officialUrl $sourcesSHA256 $targetFile
|
||||
tar -C "$tmpFolder" -Jxf "$targetFile"
|
||||
fi
|
||||
|
||||
mkdir -p "$buildFolder"
|
||||
cd "$buildFolder"
|
||||
|
||||
$srcFolder/configure \
|
||||
--prefix=$installPrefix \
|
||||
--sysconfdir=etc \
|
||||
--enable-llvm-link-shared \
|
||||
--enable-profiler \
|
||||
--disable-cargo-native-static \
|
||||
--disable-vendor \
|
||||
--disable-docs \
|
||||
--disable-lld \
|
||||
--target=$target \
|
||||
--release-description=QtCI \
|
||||
--release-channel=$channel
|
||||
|
||||
echo "Building rust"
|
||||
python $srcFolder/x.py dist
|
||||
|
||||
# x.py doesnt like running as root so install under our temporary folder for now
|
||||
export DESTDIR=$tmpFolder
|
||||
|
||||
echo "Installing rust"
|
||||
python $srcFolder/x.py install
|
||||
|
||||
# rustc must be in path for cargo to work
|
||||
OLDPATH=$PATH
|
||||
export PATH=$DESTDIR$installPrefix/bin:$PATH
|
||||
|
||||
echo "Installing rust bindgen tool."
|
||||
$tmpFolder$installPrefix/bin/cargo install bindgen-cli --root $DESTDIR$installPrefix
|
||||
|
||||
tar -czf "$outputTarball" -C "$DESTDIR$installPrefix" .
|
||||
|
||||
rm -rf "$buildFolder"
|
||||
export PATH=$OLDPATH
|
||||
unset DESTDIR
|
||||
}
|
||||
|
||||
function InstallRust() {
|
||||
buildFolder=$1
|
||||
installPrefix=$2
|
||||
target=$3
|
||||
channel=$4
|
||||
prebuiltSHA256=$5
|
||||
|
||||
tmpFolder=$(mktemp -d)
|
||||
|
||||
# e.g rust-1.92.0-macos-arm64-prebuilt.tar.gz or rust-1.92.0-macos-amd64-prebuilt.tar.gz
|
||||
prebuiltFile="rust-$version-$PROVISIONING_OS-$PROVISIONING_ARCH-prebuilt.tar.gz"
|
||||
prebuiltRust="http://ci-files01-hki.ci.qt.io/input/rust/$prebuiltFile"
|
||||
prebuiltTarget="$tmpFolder$prebuiltFile"
|
||||
|
||||
DownloadURL $prebuiltRust "" $prebuiltSHA256 $prebuiltTarget $tmpFolder || (
|
||||
if [ $COIN_RUNS_IN_QT_COMPANY = true ]
|
||||
then
|
||||
echo "Fetching prebuilt rust failed."
|
||||
exit 1
|
||||
else
|
||||
echo "Fetching prebuilt rust failed. Building from sources."
|
||||
BuildRust $buildFolder $installPrefix $target $channel $prebuiltTarget
|
||||
fi
|
||||
)
|
||||
|
||||
sudo mkdir "$installPrefix"
|
||||
sudo tar -xzf "$prebuiltTarget" -C "$installPrefix"
|
||||
rm -rf "$prebuiltTarget"
|
||||
rm -rf "$tmpFolder"
|
||||
|
||||
SetEnvVar "PATH" "$installPrefix/bin:\$PATH"
|
||||
|
||||
echo "Rust = $version" >> ~/versions.txt
|
||||
}
|
||||
@@ -22,13 +22,3 @@ sudo mv "$targetFile" "$targetFolder"
|
||||
|
||||
SetEnvVar "PATH" "$targetFolder:\$PATH"
|
||||
|
||||
# Extract baseline cache
|
||||
sha1="e397b7934a8c892753166435aff8775c0b5aa5bf"
|
||||
pkgname="maven_cache-openapi-$version.tar.gz"
|
||||
internalUrl="http://ci-files01-hki.ci.qt.io/input/qtopenapi/maven/$pkgname"
|
||||
|
||||
targetFile="$HOME/$pkgname"
|
||||
DownloadURL "$internalUrl" "$internalUrl" "$sha1" "$targetFile"
|
||||
echo "Extracting maven cache to ~/.m2"
|
||||
tar -xzf "$targetFile" -C "$HOME"
|
||||
rm "$targetFile"
|
||||
|
||||
@@ -5,23 +5,21 @@
|
||||
# This script install prebuilt OpenSSL which was built against Android NDK 25.
|
||||
# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
|
||||
|
||||
set -eux
|
||||
set -ex
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
outputPathBase="${HOME}"
|
||||
|
||||
sslVersionForLatest="3.5.4"
|
||||
sslVersionForLatest="3.0.7"
|
||||
ndkVersionLatest="r27c"
|
||||
featureSuffixLatest="_16kb_fixed_symversions"
|
||||
prebuiltOpensslShaLatest="b9dc30ed77bfd26e526e81d558d6964585b27283"
|
||||
featureSuffixLatest="_16kb"
|
||||
prebuiltOpensslShaLatest="2cc15dd990460c2c7157ab257a47071fbd9e0ac8"
|
||||
|
||||
sslVersionForPreview="3.5.4"
|
||||
sslVersionForPreview="3.0.7"
|
||||
ndkVersionPreview="r29-beta2"
|
||||
featureSuffixPreview="_16kb_fixed_symversions"
|
||||
prebuiltOpensslShaPreview="89b6692e983c7e9678dcd9fc03da623fb75593d3"
|
||||
featureSuffixPreview="_16kb"
|
||||
prebuiltOpensslShaPreview="76c9788216440111be97ea1a63c4d8cd807baacd"
|
||||
|
||||
ndkVersionNightly1=$ndkVersionLatest
|
||||
sslVersionForNightly1=$sslVersionForLatest
|
||||
@@ -33,126 +31,87 @@ sslVersionForNightly2=$sslVersionForLatest
|
||||
featureSuffixNightly2=""
|
||||
prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest
|
||||
|
||||
: <<'EOB' SOURCE BUILD INSTRUCTIONS
|
||||
Openssl 3.5.4 prebuilt was made using Android NDK r27c Revision 27.2.12479018
|
||||
and r29-beta2 Revision 29.0.13599879
|
||||
: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r29-beta2
|
||||
# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd"
|
||||
exports_file="/tmp/export.sh"
|
||||
# source previously made environmental variables.
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
fi
|
||||
|
||||
By using a helpful (build_ssl.sh) script from:
|
||||
Android OpenSSL support for Qt
|
||||
https://github.com/KDAB/android_openssl/commit/b71f1470962019bd89534a2919f5925f93bc5779
|
||||
|
||||
Download the same NDK version that the Qt branch supports
|
||||
https://developer.android.com/ndk/downloads
|
||||
|
||||
Modify the script to your liking: set a path to NDK root, set OpenSSL version
|
||||
(script will download needed OpenSSL packages)
|
||||
Set ANDROID_API to the lowest version of Android which will be used.
|
||||
officialUrl="https://www.openssl.org/source/openssl-$sslVersionForLatest.tar.gz"
|
||||
cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$sslVersionForLatest.tar.gz"
|
||||
targetFile="/tmp/openssl-$sslVersionForLatest.tar.gz"
|
||||
sha="f20736d6aae36bcbfa9aba0d358c71601833bf27"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${sslVersionForLatest}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
|
||||
if uname -a |grep -q "Darwin"; then
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
|
||||
else
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
|
||||
fi
|
||||
cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
EOB
|
||||
|
||||
function BuildOutputPath() {
|
||||
local ndkVersion="$1"
|
||||
local suffix="$2"
|
||||
local sslVersion="$3"
|
||||
|
||||
echo "${outputPathBase}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
|
||||
}
|
||||
|
||||
function InstallPrebuiltOpenssl() {
|
||||
local ndkVersion="$1"
|
||||
local suffix="$2"
|
||||
local sha="$3"
|
||||
local sslVersion="$4"
|
||||
local output_dir="$5"
|
||||
|
||||
local prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
|
||||
local targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
|
||||
ndkVersion=$1
|
||||
suffix=$2
|
||||
sha=$3
|
||||
sslVersion=$4
|
||||
|
||||
renamed_root="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}"
|
||||
|
||||
prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
|
||||
targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}${suffix}.zip"
|
||||
|
||||
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
||||
|
||||
local tmp_extract
|
||||
tmp_extract="$(mktemp -d "${TMPDIR:-/tmp}/openssl-extract.XXXXXX")"
|
||||
unzip -q -o "$targetFile" -d "$tmp_extract"
|
||||
rm -f "$targetFile"
|
||||
sudo rm -f "$targetFile"
|
||||
|
||||
# We assume there is only one top-level directory in the openssl zip
|
||||
local temp_openssl_root
|
||||
temp_openssl_root="$(find "$tmp_extract" -mindepth 1 -maxdepth 1 -type d | head -n 1)"
|
||||
if [[ -z "$temp_openssl_root" ]]; then
|
||||
echo "ERROR: Expected a single top-level directory in the archive, but none was found." >&2
|
||||
exit 1
|
||||
return 1
|
||||
fi
|
||||
|
||||
mv "$temp_openssl_root" "$output_dir"
|
||||
mv "$temp_openssl_root" "$renamed_root"
|
||||
rm -rf "$tmp_extract"
|
||||
|
||||
# There have been cases where necessary symlinks are lost when unarchiving.
|
||||
# Force-create them now.
|
||||
local abi_list="arm64-v8a armeabi-v7a x86 x86_64"
|
||||
for abi in $abi_list; do
|
||||
ln -fs "${output_dir}/include" "${output_dir}/${abi}/include"
|
||||
ln -fs "${output_dir}/${abi}/libcrypto_3.so" "${output_dir}/${abi}/libcrypto.so"
|
||||
ln -fs "${output_dir}/${abi}/libssl_3.so" "${output_dir}/${abi}/libssl.so"
|
||||
done
|
||||
opensslHome="${renamed_root}"
|
||||
}
|
||||
|
||||
if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then
|
||||
outputDirNightly1=$(BuildOutputPath \
|
||||
"$ndkVersionNightly1" \
|
||||
"$featureSuffixNightly1" \
|
||||
"$sslVersionForNightly1")
|
||||
|
||||
InstallPrebuiltOpenssl \
|
||||
"$ndkVersionNightly1" \
|
||||
"$featureSuffixNightly1" \
|
||||
"$prebuiltOpensslShaNightly1" \
|
||||
"$sslVersionForNightly1" \
|
||||
"$outputDirNightly1"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly1"
|
||||
echo "OpenSSL for Android ${ndkVersionNightly1} = ${sslVersionForNightly1}" >> ~/versions.txt
|
||||
InstallPrebuiltOpenssl "$ndkVersionNightly1" "$featureSuffixNightly1" "$prebuiltOpensslShaNightly1" "$sslVersionForNightly1"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome"
|
||||
echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt
|
||||
fi
|
||||
|
||||
if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then
|
||||
outputDirNightly2=$(BuildOutputPath \
|
||||
"$ndkVersionNightly2" \
|
||||
"$featureSuffixNightly2" \
|
||||
"$sslVersionForNightly2")
|
||||
|
||||
InstallPrebuiltOpenssl \
|
||||
"$ndkVersionNightly2" \
|
||||
"$featureSuffixNightly2" \
|
||||
"$prebuiltOpensslShaNightly2" \
|
||||
"$sslVersionForNightly2" \
|
||||
"$outputDirNightly2"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$outputDirNightly2"
|
||||
echo "OpenSSL for Android ${ndkVersionNightly2} = ${sslVersionForNightly2}" >> ~/versions.txt
|
||||
InstallPrebuiltOpenssl "$ndkVersionNightly2" "$featureSuffixNightly2" "$prebuiltOpensslShaNightly2" "$sslVersionForNightly2"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome"
|
||||
echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt
|
||||
fi
|
||||
|
||||
if [ "$ndkVersionPreview" != "$ndkVersionLatest" ]; then
|
||||
outputDirPreview="$(BuildOutputPath \
|
||||
"$ndkVersionPreview" \
|
||||
"$featureSuffixPreview" \
|
||||
"$sslVersionForPreview")"
|
||||
|
||||
InstallPrebuiltOpenssl \
|
||||
"$ndkVersionPreview" \
|
||||
"$featureSuffixPreview" \
|
||||
"$prebuiltOpensslShaPreview" \
|
||||
"$sslVersionForPreview" \
|
||||
"$outputDirPreview"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$outputDirPreview"
|
||||
echo "OpenSSL for Android ${ndkVersionPreview} = ${sslVersionForPreview}" >> ~/versions.txt
|
||||
InstallPrebuiltOpenssl "$ndkVersionPreview" "$featureSuffixPreview" "$prebuiltOpensslShaPreview" "$sslVersionForPreview"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_PREVIEW" "$opensslHome"
|
||||
echo "OpenSSL for Android $ndkVersionPreview = $sslVersionForPreview" >> ~/versions.txt
|
||||
fi
|
||||
|
||||
outputDirLatest="$(BuildOutputPath \
|
||||
"$ndkVersionLatest" \
|
||||
"$featureSuffixLatest" \
|
||||
"$sslVersionForLatest")"
|
||||
|
||||
InstallPrebuiltOpenssl \
|
||||
"$ndkVersionLatest" \
|
||||
"$featureSuffixLatest" \
|
||||
"$prebuiltOpensslShaLatest" \
|
||||
"$sslVersionForLatest" \
|
||||
"$outputDirLatest"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$outputDirLatest"
|
||||
echo "OpenSSL for Android ${ndkVersionLatest} = ${sslVersionForLatest}" >> ~/versions.txt
|
||||
InstallPrebuiltOpenssl "$ndkVersionLatest" "$featureSuffixLatest" "$prebuiltOpensslShaLatest" "$sslVersionForLatest"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome"
|
||||
echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt
|
||||
|
||||
@@ -36,6 +36,4 @@ function installSccache {
|
||||
# Prevents some random network I/O errors from failing compilation
|
||||
# Does not seem to affect much though
|
||||
SetEnvVar "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
|
||||
# Enable a local preprocessor cache.
|
||||
SetEnvVar SCCACHE_DIRECT 1
|
||||
}
|
||||
|
||||
@@ -15,15 +15,15 @@ if (Is64BitWinHost) {
|
||||
# Msys need to be installed to target machine
|
||||
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
|
||||
|
||||
$openssl_version_latest = "3.5.4"
|
||||
$ndk_version_latest = "r27c_16kb"
|
||||
$prebuilt_ssl_sha1_latest = "a76cd9ec719d4e71473dcf451d648a9766247081"
|
||||
$openssl_sha1_latest = "b75daac8e10f189abe28a076ba5905d363e4801f"
|
||||
$openssl_version_latest = "3.0.7"
|
||||
$ndk_version_latest = "r27c"
|
||||
$prebuilt_ssl_sha1_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e"
|
||||
$openssl_sha1_latest = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
|
||||
|
||||
$openssl_version_preview = "3.5.4"
|
||||
$ndk_version_preview = "r29-beta2_16kb"
|
||||
$prebuilt_ssl_sha1_preview = "664bab8b4f5e01c8bb87ab0ea8333b2ef1af703d"
|
||||
$openssl_sha1_preview = "b75daac8e10f189abe28a076ba5905d363e4801f"
|
||||
$openssl_version_preview = "3.0.7"
|
||||
$ndk_version_preview = "r29-beta2"
|
||||
$prebuilt_ssl_sha1_preview = "c2cf8fabfb7e00b31abcc554e6e306dafd99ae1b"
|
||||
$openssl_sha1_preview = "f20736d6aae36bcbfa9aba0d358c71601833bf27"
|
||||
|
||||
$openssl_version_nightly1 = $openssl_version_latest
|
||||
$ndk_version_nightly1 = $ndk_version_latest
|
||||
|
||||
@@ -52,26 +52,25 @@ $sdkZip = "c:\Windows\Temp\$toolsFile"
|
||||
New-Item -ItemType Directory -Path C:\Utils\Android\
|
||||
New-Item -ItemType Directory -Path C:\Windows\Temp\android_extract
|
||||
|
||||
function Install($1, $2, $3, $4, $5) {
|
||||
function Install($1, $2, $3, $4) {
|
||||
$cacheUrl = $1
|
||||
$zip = $2
|
||||
$checksum = $3
|
||||
$offcialUrl = $4
|
||||
$ndkVersion = $5
|
||||
$tempExtractDir = "C:\Windows\Temp\android_extract"
|
||||
|
||||
Download $offcialUrl $cacheUrl $zip
|
||||
Verify-Checksum $zip "$checksum"
|
||||
Extract-7Zip $zip $tempExtractDir
|
||||
$baseDirectory = (Get-ChildItem $tempExtractDir -Attributes D | Select-Object -First 1).Name
|
||||
Move-Item -Path ($tempExtractDir + "\" + $baseDirectory) -Destination "C:\Utils\Android\$ndkVersion\$baseDirectory" -Force
|
||||
Move-Item -Path ($tempExtractDir + "\" + $baseDirectory) -Destination "C:\Utils\Android\$baseDirectory" -Force
|
||||
Remove $zip
|
||||
|
||||
return "C:\Utils\Android\$ndkVersion\$baseDirectory"
|
||||
return "C:\Utils\Android\$baseDirectory"
|
||||
}
|
||||
|
||||
Write-Host "Installing Android NDK $nkdVersionLatest"
|
||||
$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest $nkdVersionLatest
|
||||
$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest
|
||||
Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest
|
||||
# To be used by vcpkg
|
||||
Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderLatest
|
||||
@@ -85,14 +84,14 @@ if ($ndkVersionPreview -ne $ndkVersionLatest) {
|
||||
|
||||
if ($ndkVersionNightly1 -ne $ndkVersionLatest) {
|
||||
Write-Host "Installing Android NDK $ndkVersionNightly1"
|
||||
$ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1 $ndkVersionNightly1
|
||||
$ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1
|
||||
Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY1" $ndkFolderNightly
|
||||
Write-Output "Android NDK = $ndkVersionNightly1" >> ~/versions.txt
|
||||
}
|
||||
|
||||
if ($ndkVersionNightly2 -ne $ndkVersionLatest) {
|
||||
Write-Host "Installing Android NDK $ndkVersionNightly2"
|
||||
$ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2 $ndkVersionNightly2
|
||||
$ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2
|
||||
Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY2" $ndkFolderNightly
|
||||
Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ $sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
|
||||
$package_path = "C:\Windows\Temp\$package"
|
||||
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing DirectX SDK"
|
||||
Run-Executable $package_path "/u"
|
||||
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
diffutils
|
||||
make
|
||||
yasm
|
||||
@@ -49,7 +49,6 @@ function build-install-grpc {
|
||||
"-DgRPC_SSL_PROVIDER=package"
|
||||
# protobuf
|
||||
"-DProtobuf_USE_STATIC_LIBS=ON"
|
||||
"-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
|
||||
"-DCMAKE_PREFIX_PATH=$protobufRoot"
|
||||
)
|
||||
cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" $extraCMakeArgs $configureOptions
|
||||
|
||||
@@ -2,20 +2,16 @@ function Verify-Checksum
|
||||
{
|
||||
Param (
|
||||
[string]$File=$(throw("You must specify a filename to get the checksum of.")),
|
||||
[string]$Expected=$(throw("Checksum required"))
|
||||
[string]$Expected=$(throw("Checksum required")),
|
||||
[ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1"
|
||||
)
|
||||
switch ($Expected.Length) {
|
||||
40 { $Algorithm = "SHA1" }
|
||||
64 { $Algorithm = "SHA256" }
|
||||
default { throw "Unknown hash length for: $Expected" }
|
||||
}
|
||||
Write-Host "Verifying checksum of $File"
|
||||
$fs = new-object System.IO.FileStream $File, "Open"
|
||||
$algo = [type]"System.Security.Cryptography.$Algorithm"
|
||||
$crypto = $algo::Create()
|
||||
$hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "")
|
||||
$fs.Close()
|
||||
if ($hash -ine $Expected) {
|
||||
if ($hash -ne $Expected) {
|
||||
throw "Checksum verification failed, got: '$hash' expected: '$Expected'"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -271,16 +271,10 @@ function InstallAndroidArmv7 {
|
||||
$patchelf_sources = "https://ci-files01-hki.ci.qt.io/input/android/patchelf/0.17.2.tar.gz"
|
||||
$patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz"
|
||||
|
||||
try {
|
||||
Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location
|
||||
Verify-Checksum $patchelf_download_location $patchelf_sha1
|
||||
Extract-tar_gz $patchelf_download_location $unzip_location
|
||||
Remove $patchelf_download_location
|
||||
} catch {
|
||||
Write-Host "Error grabbing sources when installing patchelf:"
|
||||
Write-Host $_
|
||||
return $false
|
||||
}
|
||||
Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location
|
||||
Verify-Checksum $patchelf_download_location $patchelf_sha1
|
||||
Extract-tar_gz $patchelf_download_location $unzip_location
|
||||
Remove $patchelf_download_location
|
||||
|
||||
Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./bootstrap.sh && ./configure && make install`"")
|
||||
|
||||
|
||||
@@ -3,23 +3,23 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$version = "1.26.2"
|
||||
$version = "1.22.4"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
x64 {
|
||||
$arch = "amd64"
|
||||
$sha256 = "84826eca833548bb2beabe7429052eaaec18faa902fde723898d906b42e59a73"
|
||||
$sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f"
|
||||
break
|
||||
}
|
||||
x86 {
|
||||
$arch = "386"
|
||||
$sha256 = "9a63074567b8a0a94091e8f6c2096f5d4d0369c7bbaed08158a63004d8b8cac1"
|
||||
$sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0"
|
||||
break
|
||||
}
|
||||
arm64 {
|
||||
$arch = "arm64"
|
||||
$sha256 = "f59e0e51370cac7ab5742c4ed9fc151f0a20918396c893996125a1c6ed7d9525"
|
||||
$sha256 = "553cc6c460f4e3eb4fad5b897c0bb22cd8bbeb20929f0e3eeb939420320292ce"
|
||||
break
|
||||
}
|
||||
default {
|
||||
@@ -33,7 +33,7 @@ $url_official = "https://go.dev/dl/go" + $version + ".windows-" + $arch + ".msi"
|
||||
|
||||
Write-Host "Fetching Go $version..."
|
||||
Download $url_official $url_cache $goPackage
|
||||
Verify-Checksum $goPackage $sha256
|
||||
Verify-Checksum $goPackage $sha256 sha256
|
||||
Write-Host "Installing Go $version..."
|
||||
Run-Executable "msiexec" "/quiet /i $goPackage"
|
||||
Write-Output "Go = $version" >> ~\versions.txt
|
||||
|
||||
@@ -9,10 +9,10 @@ $version = "20240113"
|
||||
$prog = "msys2"
|
||||
$arch = "x86_64"
|
||||
$sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6"
|
||||
$sha1_prebuilt = "29d16a81de4a570c41f92491e20b5554a1baab8f"
|
||||
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
|
||||
$folder = "msys64"
|
||||
|
||||
$package_prebuilt = $folder + "_" + $version + "_prebuilt_v2.7z"
|
||||
$package_prebuilt = $folder + "_" + $version + "_prebuilt.7z"
|
||||
$package = $prog + "-base-" + $arch + "-" + $version + ".tar.xz"
|
||||
|
||||
$url_cache_prebuilt = "\\ci-files01-hki.ci.qt.io\provisioning\windows\$package_prebuilt"
|
||||
@@ -20,8 +20,6 @@ $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/$package"
|
||||
$url_official = "http://repo.msys2.org/distrib/$arch/$package"
|
||||
$TargetLocation = "C:\Utils"
|
||||
|
||||
$required_packages = @("perl")
|
||||
$required_packages += Get-Content "$PSScriptRoot\..\windows\ffmpeg_required_msys_packages.txt"
|
||||
|
||||
if ((Test-Path $url_cache_prebuilt)) {
|
||||
$PackagePath = "C:\Windows\Temp\$package_prebuilt"
|
||||
@@ -37,8 +35,7 @@ if ((Test-Path $url_cache_prebuilt)) {
|
||||
|
||||
# install perl make and yasm
|
||||
# Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file.
|
||||
$required_packages_string = $required_packages -join ' '
|
||||
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm $required_packages_string`""
|
||||
cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman-key --refresh;pacman -S --noconfirm perl make yasm diffutils`""
|
||||
Start-Sleep -s 60
|
||||
cmd /c "$msys `"-l`" `"-c`" `"echo y | cpan -i Text::Template Test::More`""
|
||||
|
||||
@@ -49,16 +46,6 @@ if ((Test-Path $url_cache_prebuilt)) {
|
||||
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
|
||||
}
|
||||
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
# Confirm that we have the correct packages installed, in case prebuilt MSYS
|
||||
# binaries are missing them.
|
||||
$installed = & "$msys" -lc "pacman -Qq"
|
||||
$installedSet = $installed | Sort-Object -Unique
|
||||
$missing_packages = $required_packages | Where-Object { $_ -notin $installedSet }
|
||||
if ($missing_packages.Count -ne 0) {
|
||||
throw "Missing MSYS packages: $($missing_packages -join ' ')"
|
||||
}
|
||||
|
||||
Write-Host "Cleaning $PackagePath.."
|
||||
Remove "$PackagePath"
|
||||
|
||||
|
||||
@@ -5,14 +5,14 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$version = "7.18.0"
|
||||
$version = "7.15.0"
|
||||
|
||||
$temp = "$env:tmp"
|
||||
Write-Host "Fetching openapi generator ver. $version..."
|
||||
$url_cache = "http://ci-files01-hki.ci.qt.io/input/qtopenapi/openapi_client_generators/openapi-generator-cli-$version.jar"
|
||||
$url_official = "https://repo1.maven.org/maven2/org/openapitools/openapi-generator-cli/$version/openapi-generator-cli-$version.jar"
|
||||
$target_file = "openapi-generator-cli.jar"
|
||||
$sha1 = "8bd615a50b15ebf5be30e612af112526a6e81ac4"
|
||||
$sha1 = "bb58e257f724fb46b7f2b309a9fa98e63fd7199f"
|
||||
|
||||
Download $url_official $url_cache "$temp\$target_file"
|
||||
Verify-Checksum "$temp\$target_file" $sha1
|
||||
@@ -25,14 +25,3 @@ Move-Item "$temp\$target_file" "$openapi_location\$target_file"
|
||||
Prepend-Path "$openapi_location"
|
||||
|
||||
Write-Output "OpenAPI generator = $version" >> ~/versions.txt
|
||||
|
||||
# Extract baseline cache for openapi
|
||||
$pkgname = "maven_cache-openapi-$version.tar.gz"
|
||||
$url_cache = "http://ci-files01-hki.ci.qt.io/input/qtopenapi/maven/$pkgname"
|
||||
$sha1 = "e397b7934a8c892753166435aff8775c0b5aa5bf"
|
||||
|
||||
Download $url_cache $url_cache "$temp\$pkgname"
|
||||
Verify-Checksum "$temp\$pkgname" $sha1
|
||||
$cache_location = "C:\Users\qt"
|
||||
Write-Host "Extracting $pkgname to $cache_location"
|
||||
Extract-tar_gz "$temp\$pkgname" "$cache_location"
|
||||
|
||||
@@ -10,17 +10,17 @@ $temp = "$env:tmp"
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$base_file_name = "OpenSSH-ARM64"
|
||||
$zipPackage = "OpenSSH-ARM64"
|
||||
$sha1 = "ca3e8f44a550b7ae71c8e122acd4ed905d66feb0"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$base_file_name = "OpenSSH-Win64"
|
||||
$zipPackage = "OpenSSH-Win64"
|
||||
$sha1 = "1397d40d789ae0911b3cc818b9dcd9321fed529b"
|
||||
Break
|
||||
}
|
||||
x86 {
|
||||
$base_file_name = "OpenSSH-Win32"
|
||||
$zipPackage = "OpenSSH-Win32"
|
||||
$sha1 = "4642C62F72C108C411E27CE282A863791B63329B"
|
||||
Break
|
||||
}
|
||||
@@ -29,27 +29,20 @@ switch ($cpu_arch) {
|
||||
}
|
||||
}
|
||||
|
||||
Write-Host "Fetching $base_file_name $version..."
|
||||
$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/$version/$base_file_name.zip"
|
||||
$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/$version/$base_file_name.zip"
|
||||
$output_zip_file = "$temp\$base_file_name.zip"
|
||||
Download $url_official $url_cache $output_zip_file
|
||||
Verify-Checksum $output_zip_file $sha1
|
||||
Write-Host "Fetching $zipPackage $version..."
|
||||
$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/openssh/" + $version + "/" + $zipPackage + ".zip"
|
||||
$url_official = "https://github.com/PowerShell/Win32-OpenSSH/releases/download/" + $version + "/" + $zipPackage + ".zip"
|
||||
Download $url_official $url_cache "$temp\$zipPackage"
|
||||
Verify-Checksum "$temp\$zipPackage" $sha1
|
||||
|
||||
Write-Host "Extracting the package"
|
||||
Extract-7Zip $output_zip_file "C:\Program Files"
|
||||
# We assume the incoming zip contains exactly one directory, named the same
|
||||
# as the base file name of th zip.
|
||||
$output_dir = "C:\Program Files\$base_file_name"
|
||||
if (-not (Test-Path $output_dir -PathType Container)) {
|
||||
throw "Error. Expected output directory '$output_dir' does not exist."
|
||||
}
|
||||
Extract-7Zip "$temp\$zipPackage" C:\"Program Files"
|
||||
|
||||
Write-Host "Installing $base_file_name $version..."
|
||||
$install_script = "$output_dir\install-sshd.ps1"
|
||||
Write-Host "Installing $zipPackage $version..."
|
||||
$path = "C:\Program Files\" + $zipPackage + "\install-sshd.ps1"
|
||||
|
||||
# Installation done as shown at https://github.com/PowerShell/Win32-OpenSSH/wiki/Install-Win32-OpenSSH
|
||||
powershell.exe -ExecutionPolicy Bypass -File $install_script
|
||||
powershell.exe -ExecutionPolicy Bypass -File $path
|
||||
netsh advfirewall firewall add rule name=sshd dir=in action=allow protocol=TCP localport=22
|
||||
net start sshd
|
||||
Set-Service sshd -StartupType Automatic
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
# Copyright (C) 2026 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script will install Rust
|
||||
|
||||
$rust_version="1.92.0"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$rust_arch = "aarch64"
|
||||
$sha256="DBB09F213D5A9EBB3B2F4C7D65BA7C3C6CAD7D9A76927D079604020C3EA0AD5A"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$rust_arch = "x86_64"
|
||||
$sha256="BD3FD270E92D12094151AAE3A67435B7FEF2164B10D96E99A94230929CDA09FD"
|
||||
Break
|
||||
}
|
||||
default {
|
||||
throw "Unknown architecture $cpu_arch"
|
||||
}
|
||||
}
|
||||
|
||||
$installer_name="rust-" + $rust_version + "-" + $rust_arch + "-pc-windows-msvc.msi"
|
||||
|
||||
$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\" + $installer_name
|
||||
$url_official = "https://static.rust-lang.org/dist/" + $installer_name
|
||||
$tmp_package = "C:\Windows\Temp\" + $installer_name
|
||||
|
||||
Download $url_official $url_cache $tmp_package
|
||||
Verify-Checksum $tmp_package $sha256 "sha256"
|
||||
Run-Executable "msiexec" "/quiet /i $tmp_package"
|
||||
|
||||
Set-EnvironmentVariable "PATH" "C:\Program Files\Rust stable MSVC 1.92\bin;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
|
||||
|
||||
Run-Executable "cargo" "install bindgen-cli --root=C:\Utils\rust-tools"
|
||||
|
||||
Set-EnvironmentVariable "PATH" "C:\Utils\rust-tools\bin;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
|
||||
|
||||
Write-Host "Cleaning $tmp_package.."
|
||||
Remove "$tmp_package"
|
||||
|
||||
Write-Output "Rust = $version" >> ~\versions.txt
|
||||
@@ -6,22 +6,22 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$version="v0.15.0"
|
||||
$version="v0.11.0-jimis3"
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$arch="aarch64-pc-windows-msvc"
|
||||
$sha="f4f304dc9dd9bd2f9b0032a0091efac1c093934bb095f207381558f80c3d0a24"
|
||||
$sha1="be429b6c33da9408bba827815d04fceeadf6dbd1"
|
||||
break
|
||||
}
|
||||
x64 {
|
||||
$arch="x86_64-pc-windows-msvc"
|
||||
$sha="b0b257a164bf438b2dea134ca7ded41c100f59a64b3bf275a202f1e8102ab217"
|
||||
$sha1="bcce35f6b39e2d1d0829f2277fd749767e057486"
|
||||
break
|
||||
}
|
||||
x86 {
|
||||
$arch="x86-pc-windows-gnu"
|
||||
$sha="287f4c3b7db21b72138704b8fe96827e6b1643a8"
|
||||
$sha1="287f4c3b7db21b72138704b8fe96827e6b1643a8"
|
||||
$version="0.2.13-alpha-0"
|
||||
break
|
||||
}
|
||||
@@ -40,7 +40,7 @@ $targetFolder = "C:\Program Files\"
|
||||
|
||||
Write-Host "Downloading sccache $version..."
|
||||
Download $urlOfficial $urlCache $tempfile
|
||||
Verify-Checksum $tempfile $sha
|
||||
Verify-Checksum $tempfile $sha1
|
||||
Write-Host "Extracting $tempfile to $targetFolder..."
|
||||
Extract-tar_gz $tempfile $targetFolder
|
||||
Remove-Item -Path $tempfile
|
||||
@@ -53,8 +53,6 @@ Set-EnvironmentVariable "SCCACHE_IGNORE_SERVER_IO_ERROR" "1"
|
||||
|
||||
# add sccache to PATH
|
||||
Set-EnvironmentVariable "PATH" "C:\Program Files\$basename\;$([Environment]::GetEnvironmentVariable('PATH', 'Machine'))"
|
||||
# Enable a local preprocessor cache.
|
||||
Set-EnvironmentVariable "SCCACHE_DIRECT" "1"
|
||||
|
||||
# update versions
|
||||
Write-Output "sccache = $version" >> ~\versions.txt
|
||||
|
||||
@@ -17,9 +17,9 @@ $install_location = "c:\Utils\$prog"
|
||||
|
||||
$tmp_location = "c:\users\qt\downloads"
|
||||
Download $cached_url $cached_url "$tmp_location\$pkg"
|
||||
Verify-Checksum "$tmp_location\$pkg" $sha1
|
||||
Verify-Checksum "$tmp_location\$pkg" $sha1 sha1
|
||||
Download $dep_cached_url $dep_cached_url "$tmp_location\$dep_pkg"
|
||||
Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1
|
||||
Verify-Checksum "$tmp_location\$dep_pkg" $dep_sha1 sha1
|
||||
|
||||
Extract-7Zip "$tmp_location\$pkg" $install_location
|
||||
Extract-7Zip "$tmp_location\$dep_pkg" $install_location
|
||||
|
||||
@@ -7,7 +7,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
|
||||
$vcpkgRoot = "$env:VCPKG_ROOT"
|
||||
$vcpkgInstallRoot = "armeabi-v7a-android-qt-tmp"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
|
||||
Set-Location -Path "$PSScriptRoot\vcpkg"
|
||||
Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
|
||||
|
||||
Run-Executable "$vcpkgExe" "install --triplet armeabi-v7a-android-qt --x-install-root $vcpkgInstallRoot --debug"
|
||||
|
||||
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
|
||||
|
||||
@@ -10,7 +10,9 @@ $vcpkgExe = "$env:VCPKG_ROOT\vcpkg.exe"
|
||||
$vcpkgRoot = "$env:VCPKG_ROOT"
|
||||
$vcpkgInstallRoot = "$arch-windows-qt-tmp"
|
||||
|
||||
Set-Location -Path "$PSScriptRoot\..\shared\vcpkg"
|
||||
Set-Location -Path "$PSScriptRoot\vcpkg"
|
||||
Copy-Item "$PSScriptRoot\..\shared\vcpkg-configuration.json" -Destination "$PSScriptRoot\vcpkg"
|
||||
|
||||
Run-Executable "$vcpkgExe" "install --triplet $arch-windows-qt --x-install-root $vcpkginstallroot --debug"
|
||||
|
||||
New-Item -Path "$vcpkgRoot" -Name "installed" -ItemType "directory" -Force
|
||||
|
||||
@@ -60,7 +60,7 @@ $vcpkgExeCacheUrl = "\\ci-files01-hki.ci.qt.io\provisioning\vcpkg\vcpkg-$nonDott
|
||||
$vcpkgExe = "C:\Windows\Temp\vcpkg.exe"
|
||||
|
||||
Download "$vcpkgExeOfficialUrl" "$vcpkgExeCacheUrl" "$vcpkgExe"
|
||||
Verify-Checksum $vcpkgExe $vcpkgExechecksum
|
||||
Verify-Checksum $vcpkgExe $vcpkgExechecksum "sha256"
|
||||
Move-Item "$vcpkgExe" -Destination "$vcpkgRoot" -Force
|
||||
|
||||
if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){
|
||||
|
||||
@@ -43,7 +43,7 @@ $tempfile = "C:\Windows\Temp\" + $filename_zip
|
||||
|
||||
Write-Host "Fetching Telegraf $version..."
|
||||
Download $url_official $url_cache $tempfile
|
||||
Verify-Checksum $tempfile $sha256
|
||||
Verify-Checksum $tempfile $sha256 sha256
|
||||
|
||||
Write-Host "Installing telegraf.exe under C:\Utils\telegraf"
|
||||
|
||||
|
||||
@@ -38,7 +38,7 @@ $internalUrl = "http://ci-files01-hki.ci.qt.io/input/windows/node-v$version-win-
|
||||
|
||||
Write-Host "Installing Node.js"
|
||||
Download $externalUrl $internalUrl $package
|
||||
Verify-Checksum $package $sha256
|
||||
Verify-Checksum $package $sha256 "sha256"
|
||||
Extract-7Zip $package $targetFolder
|
||||
Add-Path $installFolder
|
||||
Remove $package
|
||||
|
||||
@@ -1,28 +1,31 @@
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2022 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs OpenSSL ARM64 (debug version)
|
||||
# This script installs OpenSSL ARM64 $version.
|
||||
|
||||
##### OpenSSL ARM64 and x64-arm64 has been pre-built with following commands #####
|
||||
# From Visual studio 'C++ Universal Windows Platform support for v143 build tools' and 'Windows Universal C Runtime' were installed
|
||||
# cd C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build
|
||||
# call vcvarsamd64_arm64 (or vcvarsarm64 in Windows 11 arm64 OS)
|
||||
# curl -o C:\Utils\openssl-3.5.4.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.5.4.zip
|
||||
# (or https://github.com/openssl/openssl/releases/download/openssl-3.5.4/openssl-3.5.4.tar.gz)
|
||||
##### OpenSSL ARM64 has been pre-built with following commands #####
|
||||
# Two different builds were done to the same folder C:\openssl_arm64\. One with '--debug' and one with '--release' parameter
|
||||
# From Visual studio 'C++ Universal Windows Platform support for v142 build tools (ARM64)' and 'Windows Universal C Runtime' were installed
|
||||
# cd C:\Program Files (x86)\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build
|
||||
# call vcvarsamd64_arm64
|
||||
# curl -o C:\Utils\openssl-3.0.7.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.0.7.zip
|
||||
# cd C:\Utils
|
||||
# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.5.4.zip
|
||||
# cd C:\Utils\openssl-3.5.4
|
||||
# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\
|
||||
# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.0.7.zip
|
||||
# cd C:\Utils\openssl-3.0.7
|
||||
# perl Configure no-asm VC-WIN64-ARM --debug --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
|
||||
# nmake
|
||||
# nmake install
|
||||
##################################################################################
|
||||
#
|
||||
# perl Configure no-asm VC-WIN64-ARM --release --prefix=C:\openssl_arm64\ --openssldir=C:\openssl_arm64\
|
||||
# nmake
|
||||
# nmake install
|
||||
#################################################################################################################################################
|
||||
|
||||
$version = "3.5.4"
|
||||
|
||||
$url = "https://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version-prebuild-windows-msvc2022-arm64.zip"
|
||||
$sha1 = "e5fdf5c565e7c275fdfe877f31b387eb48da5d96"
|
||||
$version = "3_0_7"
|
||||
$url = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\openssl-$version-arm64.zip"
|
||||
$sha1 = "19be15069d981b4a96f5715f039df7aaa7456d52"
|
||||
$installFolder = "C:\openssl_arm64"
|
||||
$zip_package = "C:\Windows\Temp\$version.zip"
|
||||
|
||||
@@ -35,8 +38,9 @@ Remove $zip_package
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
# Native arm64
|
||||
# For native arm64
|
||||
Set-EnvironmentVariable "OPENSSL_ROOT_DIR_arm64" "$installFolder"
|
||||
Set-EnvironmentVariable "OPENSSL_CONF_arm64" "$installFolder\bin\openssl.cfg"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_arm64" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_arm64" "$installFolder\lib"
|
||||
Break
|
||||
@@ -44,6 +48,7 @@ switch ($cpu_arch) {
|
||||
x64 {
|
||||
# For cross-compiling x64_arm64
|
||||
Set-EnvironmentVariable "OPENSSL_ROOT_DIR_x64_arm64" "$installFolder"
|
||||
Set-EnvironmentVariable "OPENSSL_CONF_x64_arm64" "$installFolder\bin\openssl.cfg"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_x64_arm64" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_x64_arm64" "$installFolder\lib"
|
||||
}
|
||||
|
||||
@@ -1,44 +1,64 @@
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2022 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
# This script installs OpenSSL x86_64 (debug version)
|
||||
# This script installs OpenSSL $version.
|
||||
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
|
||||
|
||||
##### OpenSSL has been pre-built with following commands #####
|
||||
# cd C:\Program Files\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build
|
||||
# call vcvarsamd64
|
||||
# curl -o C:\Utils\openssl-3.5.4.zip http://ci-files01-hki.ci.qt.io/input/openssl/openssl-3.5.4.zip
|
||||
# cd C:\Utils
|
||||
# C:\Utils\sevenzip\7z.exe x C:\Utils\openssl-3.5.4.zip
|
||||
# cd C:\Utils\openssl-3.5.4
|
||||
# perl Configure VC-WIN64A --debug --prefix=C:\openssl_x64\
|
||||
# nmake
|
||||
# nmake install
|
||||
####################################################################################################
|
||||
$version = "3_0_7"
|
||||
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
|
||||
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
|
||||
|
||||
$version = "3.5.4"
|
||||
$url = "https://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version-prebuild-windows-msvc2022-x64.zip"
|
||||
$sha1 = "a028caa10ade0c1d39ad60d06201345908dfaaf2"
|
||||
$installFolder = "C:\openssl_x64"
|
||||
$zip_package = "C:\Windows\Temp\$version.zip"
|
||||
if (Is64BitWinHost) {
|
||||
|
||||
# Install x64 bit version
|
||||
$architecture = "x64"
|
||||
$installFolder = "C:\openssl"
|
||||
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
|
||||
$sha1 = "2fb73f233bc565939312782b8157bebc26a5e17b"
|
||||
|
||||
Write-Host "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $packagex64
|
||||
Verify-Checksum $packagex64 $sha1
|
||||
Write-Host "Installing $packagex64 ..."
|
||||
Run-Executable "$packagex64" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
|
||||
|
||||
Write-Host "Remove downloaded $packagex64 ..."
|
||||
Remove "$packagex64"
|
||||
|
||||
Set-EnvironmentVariable "OPENSSL_CONF_x64" "$installFolder\bin\openssl.cfg"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
|
||||
Prepend-Path "$installFolder\bin"
|
||||
}
|
||||
|
||||
# Install x86 bit version
|
||||
$architecture = "x86"
|
||||
|
||||
if (Is64BitWinHost) {
|
||||
$installFolder = "C:\openssl$architecture"
|
||||
} else {
|
||||
$installFolder = "C:\openssl"
|
||||
}
|
||||
|
||||
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
|
||||
$sha1 = "ddead693fa279ad6b1baf123b3af51a9ef289dc1"
|
||||
|
||||
Write-Host "Fetching from URL ..."
|
||||
Download $url $url $zip_package
|
||||
Verify-Checksum $zip_package $sha1
|
||||
Extract-7Zip $zip_package C:\
|
||||
Remove $zip_package
|
||||
Download $externalUrl $internalUrl $packagex86
|
||||
Verify-Checksum $packagex86 $sha1
|
||||
Write-Host "Installing $packagex86 ..."
|
||||
Run-Executable "$packagex86" "/SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
|
||||
|
||||
Set-EnvironmentVariable "OPENSSL_ROOT_DIR_x64" "$installFolder"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_x64" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_x64" "$installFolder\lib"
|
||||
Write-Host "Remove downloaded $packagex86 ..."
|
||||
Remove "$packagex86"
|
||||
|
||||
# Set envvars for builds in provisoning e.g. grpc
|
||||
Set-EnvironmentVariable "OPENSSL_ROOT_DIR" "$installFolder"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB" "$installFolder\lib"
|
||||
|
||||
Prepend-Path "$installFolder\bin"
|
||||
Set-EnvironmentVariable "OPENSSL_CONF_x86" "$installFolder\bin\openssl.cfg"
|
||||
Set-EnvironmentVariable "OPENSSL_INCLUDE_x86" "$installFolder\include"
|
||||
Set-EnvironmentVariable "OPENSSL_LIB_x86" "$installFolder\lib"
|
||||
|
||||
# Store version information to ~/versions.txt, which is used to print version information to provision log.
|
||||
Write-Output "OpenSSL x64= $version" >> ~/versions.txt
|
||||
Write-Output "OpenSSL = $version" >> ~/versions.txt
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
# Copyright (C) 2026 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 QNX 8.
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$tempFolder = "c:\Windows\Temp"
|
||||
|
||||
function DownloadAndExtract($1, $2, $3, $4, $5) {
|
||||
$url = $1
|
||||
$sha = $2
|
||||
$file = $3
|
||||
$folder = $4
|
||||
$cachedUrl = $5
|
||||
|
||||
Download $url $cachedUrl "$tempFolder\$file"
|
||||
Verify-Checksum "$tempFolder\$file" "$sha"
|
||||
Extract-tar_gz "$tempFolder\$file" $folder
|
||||
}
|
||||
|
||||
$aarch64le_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-aarch64le.cmake"
|
||||
$armv7le_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-armv7le.cmake"
|
||||
$x8664_toolchain = "$PSScriptRoot\..\shared\cmake_toolchain_files\qnx-toolchain-x8664.cmake"
|
||||
|
||||
$targetFolder = "C:\Utils\"
|
||||
$folderName = "qnx800"
|
||||
$targetPath = "$targetFolder$folderName"
|
||||
|
||||
# QNX SDP
|
||||
$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\qnx800-windows-linux-20260410.tar.xz"
|
||||
$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20260410.tar.xz"
|
||||
$targetFile = "qnx800.tar.xz"
|
||||
$sha1 = "a3fdcd98e12bc5054d00f18e4088af26288fd020"
|
||||
DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl
|
||||
|
||||
# IANA timezone database overlay. Packaged separately from the SDP so it can be
|
||||
# bumped without rebuilding the SDP tarball. Archive root is qnx800/target/qnx/
|
||||
# so it overlays onto $targetFolder (C:\Utils\) directly.
|
||||
$cachedUrl = "\\ci-files01-hki.ci.qt.io\provisioning\qnx\zoneinfo-2026a.tar.xz"
|
||||
$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/zoneinfo-2026a.tar.xz"
|
||||
$targetFile = "zoneinfo.tar.xz"
|
||||
$sha1 = "8c1678ff673bb588f63fc9277497cd38e0ea2253"
|
||||
DownloadAndExtract $sourceFile $sha1 $targetFile $targetFolder $cachedUrl
|
||||
|
||||
Copy-Item $aarch64le_toolchain $targetPath
|
||||
Copy-Item $armv7le_toolchain $targetPath
|
||||
Copy-Item $x8664_toolchain $targetPath
|
||||
|
||||
cmd /c "dir $targetPath"
|
||||
|
||||
# Verify that we have last files in tars
|
||||
if (-not (test-path $targetPath\qnxsdp-env.bat)) {
|
||||
throw "QNX SDP installation failed!"
|
||||
}
|
||||
if (-not (test-path $targetPath\qnx-toolchain-x8664.cmake)) {
|
||||
throw "QNX toolchain installation failed!"
|
||||
}
|
||||
|
||||
# Set env variables
|
||||
Set-EnvironmentVariable "QNX_800" "$targetPath"
|
||||
Set-EnvironmentVariable "QNX_800_CMAKE" "C:/Utils/$folderName"
|
||||
|
||||
Write-Output "QNX SDP = 8.0.0" >> ~\versions.txt
|
||||
@@ -1,44 +0,0 @@
|
||||
# Copyright (C) 2026 The Qt Company Ltd
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$version = "1.45.1"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
Write-Host "Installing Syft for architecture $cpu_arch"
|
||||
switch ($cpu_arch) {
|
||||
arm64 {
|
||||
$arch = "arm64"
|
||||
$sha1 = "f629f6fa9c542e8803aa13987f8104a441c15878"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
$arch = "amd64"
|
||||
$sha1 = "debd2e1e77763fe8cf224e791abf79e11dc4a93b"
|
||||
Break
|
||||
}
|
||||
default {
|
||||
throw "Unknown architecture $cpu_arch"
|
||||
}
|
||||
}
|
||||
|
||||
$filename = "syft_" + $version + "_windows_" + $arch
|
||||
$filename_zip = $filename + ".zip"
|
||||
|
||||
$zip = Get-DownloadLocation ($filename_zip)
|
||||
$externalUrl = "https://github.com/anchore/syft/releases/download/v" + $version + "/" + $filename_zip
|
||||
$internalUrl = "https://ci-files01-hki.ci.qt.io/input/syft/" + $filename_zip
|
||||
|
||||
Write-Host "Removing old syft"
|
||||
Remove "C:\syft"
|
||||
|
||||
Download $externalUrl $internalUrl $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
Extract-7Zip $zip C:\syft
|
||||
Remove "$zip"
|
||||
|
||||
Add-Path "C:\syft"
|
||||
|
||||
Write-Output "Syft ($arch) = $version" >> ~\versions.txt
|
||||
@@ -0,0 +1,14 @@
|
||||
{
|
||||
"overrides": [
|
||||
{
|
||||
"name": "openssl",
|
||||
"version": "3.0.7",
|
||||
"port-version": 2
|
||||
}
|
||||
],
|
||||
"dependencies": [
|
||||
"openssl",
|
||||
"protobuf",
|
||||
"grpc"
|
||||
]
|
||||
}
|
||||
@@ -13,7 +13,7 @@ $script:package_path = "$packageRoot\\$nugetPackage"
|
||||
|
||||
New-Item -ItemType Directory -Path "$packageRoot"
|
||||
Download $officialUrl $cachedUrl $package_path
|
||||
Verify-Checksum $package_path $sdkChecksumSha1
|
||||
Verify-Checksum $package_path $sdkChecksumSha1 sha1
|
||||
Write-Host "Installing Nuget"
|
||||
Run-Executable "$package_path" "install Microsoft.WindowsAppSDK -OutputDirectory $packageRoot"
|
||||
|
||||
|
||||
@@ -252,8 +252,6 @@ installPackages+=(libusb-1.0-0-dev)
|
||||
# password management support for Qt Creator
|
||||
installPackages+=(libsecret-1-dev)
|
||||
installPackages+=(debian-archive-keyring)
|
||||
# Keep zoneinfo up-to-date (COIN-1282)
|
||||
installPackages+=(tzdata)
|
||||
|
||||
|
||||
echo "Running update for apt"
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user