diff options
116 files changed, 958 insertions, 295 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 88e440a2..70d67220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ foreach(module IN LISTS QT_BUILD_SUBMODULES) if(module STREQUAL "qtbase") if (NOT QT_BUILD_STANDALONE_TESTS) - list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake") + list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/${INSTALL_LIBDIR}/cmake") list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}") endif() endif() diff --git a/coin/module_config.yaml b/coin/module_config.yaml index de91d6d6..89175e67 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -8,7 +8,4 @@ instructions: Build: - !include "{{qt/qt5}}/coin_qt_build_template.yaml" - Test: - - type: EnvironmentVariable - variableName: Dummy - variableValue: dummy + Test: [] diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 54d6cd6a..6b16fd06 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -12,20 +12,23 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs'] - Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace' + Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-20.04-host' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' + ] - Id: 'OpenSUSE-15.3-host' Template: 'qtci-linux-openSUSE-15.3-x86_64-50' Compiler: 'GCC' - Features: ['Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', 'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc', @@ -33,139 +36,169 @@ Configurations: - Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'DisableTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Features: ['Sccache', 'DisableTests', 'UseConfigure'] + Configure arguments: '-nomake examples -static -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Features: ['Packaging', 'Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - Id: 'Windows10_21H2-MSVC2019-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' Environment variables: [ - 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64', 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', - 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'] + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}' + ] - Id: 'Windows11_21H2-MSVC2019-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease"] - Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' + Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'MSVC2019' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure'] Platform dependency: 'Windows11_21H2-MSVC2019-x64-host' Environment variables: [ - 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON' + ] - Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Features: ['Packaging', 'Sccache', 'UseConfigure'] + 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: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc' + ] - - Template: 'qtci-macos-11-x86_64-104' + Id: 'ios-universal' + Template: 'qtci-macos-12-x86_64-102' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] - Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=', + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'] + 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang' + ] - Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Features: ['Packaging', 'Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] + 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw' + ] - Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Clang' - Features: ['Sccache'] - Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' - Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR=C:\llvm-mingw'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR=C:\llvm-mingw' + ] - Id: 'Windows11_21H2-LLVM-x64-host' - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Clang' - Features: ['Sccache'] - Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' - Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR=C:\llvm-mingw' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Sccache'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' - Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] - - Template: 'qtci-windows-11_21H2-x86_64-51' + Template: 'qtci-windows-11_21H2-x86_64-52' Compiler: 'Mingw' - Features: ['Sccache'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF' - Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + Features: ['Sccache', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples -qt-zlib -qt-freetype -qt-libjpeg' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 055c0562..0f7b0da5 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -1,14 +1,16 @@ Version: 2 Configurations: - + Id: 'qemu-armv7-on-ubuntu20.04' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache'] + Features: ['Sccache', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', @@ -21,9 +23,10 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache'] + Features: ['Sccache', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', @@ -36,9 +39,10 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Sccache', 'DisableTests'] + Features: ['Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF', + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.21.1/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 4de662ba..907e74b7 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -1,20 +1,22 @@ Version: 2 Configurations: - + Id: 'qnx-x86_64-on-ubuntu20.04' Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Packaging', 'InsignificantTests', 'VMSize8'] + Features: ['Packaging', 'VMSize8', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake', + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin', "TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'", "TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'", - "COIN_CTEST_RESULTSDIR=/home/qt/work", - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] + "COIN_CTEST_RESULTSDIR=/home/qt/work" + ] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' @@ -22,10 +24,11 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + ] - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Target os: 'QNX_710' @@ -33,7 +36,8 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'Ubuntu-20.04-host' - Features: ['Packaging', 'DisableTests'] + Features: ['Packaging', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + ] diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index fc0c5a9f..41c7b381 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -1,20 +1,25 @@ Version: 2 Configurations: - + Id: 'sles-15-static' Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-nomake examples -static -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + ] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' - Features: ['Sccache', 'MinimalStaticTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF' + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 402cbfda..2cf2d305 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -7,9 +7,10 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' ] @@ -20,9 +21,10 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang' ] @@ -33,11 +35,13 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' + 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', + 'ANDROID_EMULATOR=@emulator_x86_api_23' ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -46,9 +50,10 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' ] diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml index 4591b26c..00e2d1e4 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -1,54 +1,59 @@ Version: 2 Configurations: - - Template: 'qtci-macos-10.14-x86_64' + Id: 'android-arm64-on-macos' + Template: 'qtci-macos-12-x86_64-102' Target os: 'Android_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' ] - - Template: 'qtci-macos-10.14-x86_64' + Template: 'qtci-macos-12-x86_64-102' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang' ] - - Template: 'qtci-macos-10.14-x86_64' + Template: 'qtci-macos-12-x86_64-102' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' ] - - Template: 'qtci-macos-10.14-x86_64' + Template: 'qtci-macos-12-x86_64-102' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' ] diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml index 05e28ac6..00b433cc 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -7,10 +7,11 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'Windows10_21H2-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' ] @@ -21,10 +22,11 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'Windows10_21H2-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' ] @@ -35,10 +37,11 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'Windows10_21H2-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86 -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' ] @@ -49,10 +52,11 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'Windows10_21H2-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64 -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'] - + 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang' + ] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a161f706..a4d83240 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -5,10 +5,10 @@ Configurations: Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'OpenSUSE-15.3-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -16,22 +16,23 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'Windows10_21H2-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF'] + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF' + ] - - Template: 'qtci-macos-10.14-x86_64' + Template: 'qtci-macos-12-x86_64-102' Target os: 'WebAssembly' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Packaging', 'Sccache', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', + 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc' ] diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index 29553169..ada9081c 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -1,17 +1,20 @@ Version: 2 Configurations: - + Id: "integrity-arm64-on-ubuntu20.04" Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Target os: 'INTEGRITY' Platform dependency: 'Ubuntu-20.04-host' - Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16'] + Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64', + 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF'] + ] diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index 7f009ac1..cc651ff2 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -2,11 +2,13 @@ Version: 2 Configurations: - Id: "ios-tests-target" - Template: 'qtci-macos-10.14-x86_64' + Template: 'qtci-macos-12-x86_64-102' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests'] - Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS='] + Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang' + ] diff --git a/coin/platform_configs/linux_android_tests.yaml b/coin/platform_configs/linux_android_tests.yaml deleted file mode 100644 index a8d9602c..00000000 --- a/coin/platform_configs/linux_android_tests.yaml +++ /dev/null @@ -1,16 +0,0 @@ -Version: 2 -Configurations: -- - Template: 'qtci-linux-RHEL-8.4-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', - 'ANDROID_EMULATOR=@emulator_x86_api_23'] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 7985a109..738ce312 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -12,10 +12,11 @@ Configurations: Template: 'qtci-macos-12-x86_64-102' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF', 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' ] @@ -68,14 +69,17 @@ Configurations: Id: 'macos-latest-xcode-x86_64-developer-build' Template: 'qtci-macos-12-x86_64-102' Compiler: 'Clang' - Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' + Environment variables: [ + 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + ] - Id: 'macos-latest-xcode-arm64-developer-build' Template: 'qtci-macos-12-arm64' Compiler: 'Clang' - Features: ['DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON' + Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' # Note: We do not include OpenSSL or PostgreSQL in this build, # as the M1 CI machines are not provisioned for that yet. diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml new file mode 100644 index 00000000..4fc9032d --- /dev/null +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -0,0 +1,19 @@ +Version: 2 +Include: [ + cmake_platforms.yaml: [ + Windows10_21H2-MSVC2019-x64-host + ] +] +Configurations: +- + Template: 'qtci-windows-10_21H2-x86_64-51' + Target os: 'QNX_710' + Target arch: 'arm64' + Compiler: 'MSVC2019' + Target compiler: 'QCC' + Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' + Features: ['DisableTests', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_LIBRARY_PATH={{.Env.QNX_710}}\target\qnx7\aarch64le\lib;{{.Env.QNX_710}}\target\qnx7\aarch64le\usr\lib -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"', + ] diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml new file mode 100644 index 00000000..fca9190f --- /dev/null +++ b/coin/platform_configs/precheck.yaml @@ -0,0 +1,22 @@ +Version: 2 +Module only: True +Include: [ + cmake_platforms.yaml: [ + "Ubuntu-20.04-host", + "Windows10_21H2-MSVC2019-x64-host", + "ios-universal" + ], + macos.yaml: [ + "macos-12-x86_64-tests", + ], + cmake_platforms_target_android_host_macos.yaml: [ + "android-arm64-on-macos" + ], + cmake_platforms_qemu.yaml: [ + "qemu-armv7-on-ubuntu20.04" + ], + cmake_platforms_qemu_qnx710.yaml: [ + "qnx-x86_64-on-ubuntu20.04" + ] +] +Configurations: [] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 8de2768b..130c974f 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -4,7 +4,7 @@ Configurations: - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] @@ -18,19 +18,19 @@ Configurations: - Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Qt5', 'Sccache', 'DebugAndRelease', 'DisableTests'] + Features: ['Qt5', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - diff --git a/coin/platform_configs/qt3d.yaml b/coin/platform_configs/qt3d.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qt3d.yaml +++ b/coin/platform_configs/qt3d.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 1442b829..ff1dc91d 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -3,7 +3,6 @@ Include: [ cmake_platforms.yaml, cmake_platforms_static_tests.yaml, integrity.yaml, - ios-tests.yaml, - linux_android_tests.yaml + ios-tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtcoap.yaml b/coin/platform_configs/qtcoap.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtcoap.yaml +++ b/coin/platform_configs/qtcoap.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtdatavis3d.yaml +++ b/coin/platform_configs/qtdatavis3d.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 9ae28988..1130242e 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,6 @@ Include: [ cmake_platforms.yaml, integrity.yaml, cmake_platforms_static_tests.yaml, - linux_android_tests.yaml, linux_android_tests_developer.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlanguageserver.yaml b/coin/platform_configs/qtlanguageserver.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtlanguageserver.yaml +++ b/coin/platform_configs/qtlanguageserver.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlottie.yaml b/coin/platform_configs/qtlottie.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtlottie.yaml +++ b/coin/platform_configs/qtlottie.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtmqtt.yaml b/coin/platform_configs/qtmqtt.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtmqtt.yaml +++ b/coin/platform_configs/qtmqtt.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtmultimedia.yaml +++ b/coin/platform_configs/qtmultimedia.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtpositioning.yaml b/coin/platform_configs/qtpositioning.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtpositioning.yaml +++ b/coin/platform_configs/qtpositioning.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtremoteobjects.yaml b/coin/platform_configs/qtremoteobjects.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtremoteobjects.yaml +++ b/coin/platform_configs/qtremoteobjects.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtscxml.yaml b/coin/platform_configs/qtscxml.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtscxml.yaml +++ b/coin/platform_configs/qtscxml.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtsensors.yaml b/coin/platform_configs/qtsensors.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtsensors.yaml +++ b/coin/platform_configs/qtsensors.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtserialbus.yaml b/coin/platform_configs/qtserialbus.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qtserialbus.yaml +++ b/coin/platform_configs/qtserialbus.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtserialport.yaml b/coin/platform_configs/qtserialport.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtserialport.yaml +++ b/coin/platform_configs/qtserialport.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtspeech.yaml b/coin/platform_configs/qtspeech.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtspeech.yaml +++ b/coin/platform_configs/qtspeech.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 5d531862..82ab0218 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml, - linux_android_tests.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml index 0fc434e8..c3233842 100644 --- a/coin/platform_configs/qttranslations.yaml +++ b/coin/platform_configs/qttranslations.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml - ] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtwebchannel.yaml b/coin/platform_configs/qtwebchannel.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtwebchannel.yaml +++ b/coin/platform_configs/qtwebchannel.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/qtwebview.yaml b/coin/platform_configs/qtwebview.yaml index 75115e63..c3233842 100644 --- a/coin/platform_configs/qtwebview.yaml +++ b/coin/platform_configs/qtwebview.yaml @@ -1,6 +1,3 @@ Version: 2 -Include: [ - cmake_platforms.yaml, - linux_android_tests.yaml -] +Include: [cmake_platforms.yaml] Configurations: [] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 2bb7d680..d4a8136f 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -8,36 +8,42 @@ Configurations: - Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs'] - Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace' + Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Configure arguments: '-make examples -developer-build -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache', 'DoNotRunTests'] - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure'] + Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples -qt-zlib -qt-freetype -qt-libjpeg' Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'] + 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_system_tiff=OFF', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] - Id: 'macos-latest-xcode-universal-packaging-build' Template: 'qtci-macos-12-x86_64-102' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors'] - Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', - 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'] + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF', + 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' + ] - Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DoNotRunTests'] - Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'UseConfigure'] + 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: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc' + ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' @@ -45,9 +51,11 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', - 'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'] + 'ANDROID_EMULATOR=@automotive_emulator_x86_api_30' + ] diff --git a/coin/provisioning/common/linux/cleanup_cache.sh b/coin/provisioning/common/linux/cleanup_cache.sh new file mode 100755 index 00000000..df5bdea3 --- /dev/null +++ b/coin/provisioning/common/linux/cleanup_cache.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script needs to be called at the end of provisioning, to clean the cache directory + +set -e +set -f +QT_USER="qt" +CACHE=".cache" + +echo "---- starting cache cleanup." + +# skip if user qt does not exist +echo "---- checking user $QT_USER" +if grep -q "^$QT_USER:" /etc/passwd; then + echo "(**) found user $QT_USER" +else + echo "(WW) user $QT_USER not found." + echo "---- skipping cache cleanup." + exit 0; +fi + +# assume /home/qt as ~ won't expand into sudo +CACHEDIR="/home/$QT_USER/$CACHE" + +# delete files from a directory if it exists +echo "---- checking cache directory $CACHEDIR" +if sudo [ -d "$CACHEDIR" ]; then + if [ "$(sudo ls -A $CACHEDIR)" ]; then + echo "(WW) cache in $CACHEDIR is not empty." + echo "---- removing content:" + + # List files and delete in a loop as wildcard won't expand into sudo + FILES=`sudo ls -A1 $CACHEDIR` + while read FILE; + do + echo "--- rm -rf $FILE" + sudo rm -rf "$CACHEDIR/$FILE" + done <<< $FILES + else + echo "(**) cache in $CACHEDIR is empty." + fi +else + if sudo [ -f "$CACHEDIR" ]; then + # replace a cache file with a directory + echo "(WW) $CACHEDIR is a file." + echo "---- removing $CACHEDIR." + sudo rm -rf "$CACHEDIR" + else + echo "(WW) cache directory $CACHEDIR not found." + fi + + # create new cache directory and assign rights + echo "---- creating cache director $CACHEDIR." + sudo mkdir "$CACHEDIR" + sudo chown $QT_USER:users $CACHEDIR + sudo chmod 700 $CACHEDIR +fi diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index 112aa631..92bfcb7d 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -60,9 +60,9 @@ DownloadAndExtract () { rm -rf $file } -aarch64le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" -armv7le_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" -x8664_toolchain="${BASH_SOURCE%/*}/cmake_toolchain_files/qnx-toolchain-x8664.cmake" +aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" +armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" +x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake" QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/" targetFolder="/opt/" diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt b/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt index 53063373..13db322b 100755 --- a/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt @@ -25,7 +25,7 @@ function configure() cat >output/option_files/post_start.opt_nfs <<EOF echo "---> Starting NFS" -STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT +STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT EOF fi diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 62872b63..d52bc974 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -46,7 +46,7 @@ set -ex # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install ${BASH_SOURCE%/*}/libiodbc.rb $* +brew install --formula ${BASH_SOURCE%/*}/libiodbc.rb $* # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc diff --git a/coin/provisioning/common/macos/system_updates.sh b/coin/provisioning/common/macos/system_updates.sh index 649cdbad..fd440e93 100755 --- a/coin/provisioning/common/macos/system_updates.sh +++ b/coin/provisioning/common/macos/system_updates.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -44,3 +44,6 @@ sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownl # Disable "Install system data files and security updates" from App Store sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate CriticalUpdateInstall -boolean FALSE + +# Disable "Automatic checks" +sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticCheckEnabled -bool FALSE diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake index 3e3ee6e8..3e3ee6e8 100644 --- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake index b441859a..b441859a 100644 --- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-armv7le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake diff --git a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake index bec28b06..bec28b06 100644 --- a/coin/provisioning/common/linux/cmake_toolchain_files/qnx-toolchain-x8664.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake diff --git a/coin/provisioning/common/unix/sccache.sh b/coin/provisioning/common/unix/sccache.sh index 7adfed32..f20db84d 100755 --- a/coin/provisioning/common/unix/sccache.sh +++ b/coin/provisioning/common/unix/sccache.sh @@ -62,4 +62,11 @@ function installSccache { # disable sccache server from shutting down after being idle SetEnvVar "SCCACHE_IDLE_TIMEOUT" "0" + + # copy sccache wrapper and place as a first in PATH + mkdir -p $HOME/sccache_wrapper + cp ${BASH_SOURCE%/*}/sccache_wrapper $HOME/sccache_wrapper/sccache + chmod 755 $HOME/sccache_wrapper/sccache + SetEnvVar "PATH" "$HOME/sccache_wrapper:\$PATH" + } diff --git a/coin/provisioning/common/unix/sccache_wrapper b/coin/provisioning/common/unix/sccache_wrapper new file mode 100755 index 00000000..52e39513 --- /dev/null +++ b/coin/provisioning/common/unix/sccache_wrapper @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# Call real sccache with original arguments +# sccache /opt/android/android-ndk-r23b/toolchains/llvm/prebuilt/linux-x86_64/bin/clang --target=aarch64-none ...... +real_sccache=/usr/local/sccache/sccache +$real_sccache "$@" +retval=$? + +if test $retval -ne 0 +then + echo "Sccache command failed, re-try calling build tool directly" + "$@" + retval=$? +fi +exit $retval diff --git a/coin/provisioning/common/windows/qnx710.ps1 b/coin/provisioning/common/windows/qnx710.ps1 new file mode 100644 index 00000000..e3df17a1 --- /dev/null +++ b/coin/provisioning/common/windows/qnx710.ps1 @@ -0,0 +1,92 @@ +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs QNX 7. + +. "$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 = "qnx710" +$targetPath = "$targetFolder$folderName" + +# QNX SDP +$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\qnx\qnx710-windows-linux-20220405.tar.xz" +$sourceFile = "http://ci-files01-hki.ci.qt.io/input/qnx/qnx710-windows-linux-20220405.tar.xz" +$targetFile = "qnx710.tar.xz" +$sha1 = "134af2e0f75d7b7c516f824fafee265b89e51d48" +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_710" "$targetPath" +Set-EnvironmentVariable "QNX_710_CMAKE" "C:/Utils/$folderName" + +Write-Output "QNX SDP = 7.1.0" >> ~\versions.txt + diff --git a/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-CentOS-8.3-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh index 46322103..083d4e4b 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/02-enable-modules.sh @@ -5,7 +5,7 @@ set -ex sudo curl http://repo-clones.ci.qt.io:8081/tools/rmt-client-setup --output rmt-client-setup sudo chmod 755 rmt-client-setup sudo SUSEConnect --cleanup -sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint C9:4F:0B:81:DE:84:AF:F2:50:3E:89:B9:7F:BC:63:BB:A7:AC:BE:97 +sudo sh rmt-client-setup https://repo-clones.ci.qt.io:8082 --yes --fingerprint 80:90:7F:45:C6:DF:45:8A:57:25:1E:17:5E:D7:E3:6E:96:1B:1B:95 # Activate these modules sudo SUSEConnect -p sle-module-basesystem/15.3/x86_64 diff --git a/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15_SP3-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-cleanup.sh new file mode 100755 index 00000000..7c2090b8 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/99-cleanup.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-updates.sh index ea4d3c44..10efb43e 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-install-git.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-disable-updates.sh @@ -1,6 +1,5 @@ #!/usr/bin/env bash - set -ex BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/install-git.sh" +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/01-disable-updates.sh b/coin/provisioning/qtci-macos-10.15-x86_64/01-disable-updates.sh new file mode 100755 index 00000000..10efb43e --- /dev/null +++ b/coin/provisioning/qtci-macos-10.15-x86_64/01-disable-updates.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-11-x86_64/01-disable-updates.sh b/coin/provisioning/qtci-macos-11-x86_64/01-disable-updates.sh new file mode 100755 index 00000000..10efb43e --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/01-disable-updates.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh index 878ce325..e122c8f0 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -56,4 +56,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1 diff --git a/coin/provisioning/qtci-macos-11.0-arm/01-disable-updates.sh b/coin/provisioning/qtci-macos-11.0-arm/01-disable-updates.sh new file mode 100755 index 00000000..10efb43e --- /dev/null +++ b/coin/provisioning/qtci-macos-11.0-arm/01-disable-updates.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh b/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh index 878ce325..e122c8f0 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/20-xcode.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2022 The Qt Company Ltd. ## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -56,4 +56,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.xip 13.2 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_13.2.1.xip 13.2.1 diff --git a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh index e3cb75d8..6f65e8a6 100755 --- a/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-11.0-arm/25-python3.sh @@ -45,7 +45,7 @@ # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -brew install ${BASH_SOURCE%/*}/pyenv.rb +brew install --formula ${BASH_SOURCE%/*}/pyenv.rb pyenv install 3.9.7 diff --git a/coin/provisioning/qtci-macos-12-x86_64/01-disable-updates.sh b/coin/provisioning/qtci-macos-12-x86_64/01-disable-updates.sh new file mode 100755 index 00000000..10efb43e --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/01-disable-updates.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/50-openssl_for_android_darwin.sh b/coin/provisioning/qtci-macos-12-x86_64/50-openssl_for_android_darwin.sh new file mode 100755 index 00000000..86ae3793 --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/50-openssl_for_android_darwin.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# +set -ex + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-macos-12.0-arm/01-disable-updates.sh b/coin/provisioning/qtci-macos-12.0-arm/01-disable-updates.sh new file mode 100755 index 00000000..10efb43e --- /dev/null +++ b/coin/provisioning/qtci-macos-12.0-arm/01-disable-updates.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-12.0-arm/50-openssl_for_android_darwin.sh b/coin/provisioning/qtci-macos-12.0-arm/50-openssl_for_android_darwin.sh new file mode 100755 index 00000000..86ae3793 --- /dev/null +++ b/coin/provisioning/qtci-macos-12.0-arm/50-openssl_for_android_darwin.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2022 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# +set -ex + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/40-qnx710.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/40-qnx710.ps1 new file mode 100644 index 00000000..826cc5b2 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/40-qnx710.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\qnx710.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 index 401a5ada..c621b2ee 100644 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-python3.ps1 @@ -7,6 +7,7 @@ . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a8ac14ee5486547caf84abdf151be22d9d069c0a" "C:\Python38_64" "3.8.1" . "$PSScriptRoot\..\common\windows\python3.ps1" 32 "14ff2c2e5538b03a012cb4c9d519d970444ebd42" "C:\Python38_32" "3.8.1" +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "f8d42a421db25a01b53f0c135a9a74ddae042643" "C:\Python37_64" "3.7.9" # default ones . "$PSScriptRoot\..\common\windows\python3.ps1" 64 "bcf9bda733a9153811209c62d628c41ab6cedbe2" "C:\Python36" "3.6.2" $true . "$PSScriptRoot\..\common\windows\python3.ps1" 32 "cd9744b142eca832f9534390676e6cfb84bf655d" "C:\Python36_32" "3.6.2" $true diff --git a/qt3d b/qt3d -Subproject 0b04ce1c958ec832b5866a0d829e4c6633a3a48 +Subproject b6d9498192e589b1113d14ffb6b1c7fba2a7b46 diff --git a/qt5compat b/qt5compat -Subproject 22e6bf03e102e364a6fc093bef400d8b5b33d15 +Subproject 6bc6fe33cebd496a529749ddd7a539010aedd83 diff --git a/qtactiveqt b/qtactiveqt -Subproject eb691db74b276a035f0b5514e962ad3d387bbe7 +Subproject 7123e01a15123803c91aea3ce37afe32754bd14 diff --git a/qtbase b/qtbase -Subproject 042c1b94d0d587cd60f5ae81885c412665bde64 +Subproject fe0dd828ab031eb1fb6bcf081b463833086c538 diff --git a/qtcharts b/qtcharts -Subproject d24884cfcb67462a053382fc289424758883784 +Subproject 5e0013b27e7846c1e03a173e592958380361828 diff --git a/qtcoap b/qtcoap -Subproject ab1ece2aa17e24c075ff92a672edd092b7ed46b +Subproject 28cdb946d3c25a4aebc6e629c071b501a902b4d diff --git a/qtconnectivity b/qtconnectivity -Subproject 3741d713daaf394d0f474614c575494b79cbbf4 +Subproject d369d77c8ec3cae31a7b08541958507132dd603 diff --git a/qtdatavis3d b/qtdatavis3d -Subproject 99b73ac4de418e90e62d6b32aad8e910acd463a +Subproject 113e1124b7d4c9d8b82b3d7b2c180bd98e122a2 diff --git a/qtdeclarative b/qtdeclarative -Subproject fe043abe36577f93e3111c404bf5927d22b4a32 +Subproject 17af1433bfab54091051fa2b336a4c0866d4cc1 diff --git a/qtdoc b/qtdoc -Subproject 15d1c5a1a296f066b7e46a21153dd5208625684 +Subproject bb1f1673cb62c072268be5262dcde72218b29dd diff --git a/qtimageformats b/qtimageformats -Subproject 7863898b3ce89857ba8cf068f9460e8066dbcc2 +Subproject f2b268c79f9022afc286ed24790436b0def5862 diff --git a/qtlanguageserver b/qtlanguageserver -Subproject d2305a07ce8f1622fd924a824e0db4741b6abc4 +Subproject bdfa14f631b8d1495dad77ccfffa96f34044a8d diff --git a/qtlottie b/qtlottie -Subproject 102a9af2225547f78c1871e1ad930f91c3a711e +Subproject c14ae686397bec0aa5fb20ca3fab5d4d445b5e1 diff --git a/qtmqtt b/qtmqtt -Subproject 4fcbf03c3b6f5b09fe253c9e27a47bd5fa4ad0e +Subproject 9392cbf8033f21527c1739befcaf8fa4ae67f88 diff --git a/qtmultimedia b/qtmultimedia -Subproject 992a44e679cbbaa8c6f695df4c06afe92a765e1 +Subproject 792e5d45cf7c73d6b0c2c22af406ff3be358573 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 1ebeac1b353efd24a17fdf72eeb9b720f1453d2 +Subproject 3818fcd517594a6684ed4c24124ca5654ab9214 diff --git a/qtopcua b/qtopcua -Subproject f9cf25eeb6df41c038550892f93b6f8d2563115 +Subproject 5d56da55b5b5eb03e1840b57213997293ed925b diff --git a/qtpositioning b/qtpositioning -Subproject 0b55201adc60a802f0c5218939828452c14a86f +Subproject 263c64a5cf5ccb68cfb1ba3060a87b8aa43d099 diff --git a/qtqa b/qtqa -Subproject 18fa14320b46a962b178b5ff3335d3697321f93 +Subproject 6d348a8719cc0c51e78463962ea1eaad9f22373 diff --git a/qtquick3d b/qtquick3d -Subproject 6fb9bdc991e8f9e7779b29fb8a84a9479db9b8f +Subproject 2cbced05cecba24811d039d3d4ef8ebcc162ae3 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject 0d0c26d969336d162b074322325a9cfe3a4b182 +Subproject 041130beb0372490a7aa6d274f60da8d638d8c3 diff --git a/qtremoteobjects b/qtremoteobjects -Subproject 3af66ec0f70bc1e974dec79509c97c7f60eb27c +Subproject 4eeffd8725004d9628cfa6e581519d375942c0c diff --git a/qtrepotools b/qtrepotools -Subproject 91f7a12fded004b74271878cf80235e669acbdb +Subproject 8b623958f5c90df70d83fd1f97d79b39b14840c diff --git a/qtscxml b/qtscxml -Subproject e61fd5f52fd02b68bff67eaf1570ff477383882 +Subproject e05a7055366539a51f296218e394d6ef616cdf1 diff --git a/qtsensors b/qtsensors -Subproject 368ab3a14c717ebbffe84826570de8f0623d851 +Subproject d8f8fc3927ae26e90417802943f04789e9e2559 diff --git a/qtserialbus b/qtserialbus -Subproject 0fdcd020abee6e22ee25682979378ef20ecfb1b +Subproject d0c21044dbe52453eee90a8cdeb877eb6bc4726 diff --git a/qtserialport b/qtserialport -Subproject 5ed70e0bc8018f6babf7653a7eb636525f73024 +Subproject 3c5b4a6a0ad16b49aebc141b1b012317bf6b93e diff --git a/qtshadertools b/qtshadertools -Subproject 5057f6a376c5d01e69143b83a4d21bae19b5101 +Subproject 011d3b86679c42dbb46727de398447c86553f10 diff --git a/qtsvg b/qtsvg -Subproject 6c2988606f26468920763177171d7529e243c48 +Subproject c112dbe2e3cbdd3fa6a8f82f7fbd0a73ad33cde diff --git a/qttools b/qttools -Subproject daa01796b2091f52acdca75dff0ed88545438c5 +Subproject e24042be0fd018e40b8746d8d8f311fab034df3 diff --git a/qttranslations b/qttranslations -Subproject b380af76da7849f88f6e98f557051db69b60912 +Subproject 5d98f4ff60361508223847efa3dc619605a37db diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 384edd0513b87b136cea0f1146dd362b57d6960 +Subproject 5347a515744607c8574f13510d1665fd00d2c45 diff --git a/qtwayland b/qtwayland -Subproject 267361b18e9068f788e4e9a9d29251f1b7ea93d +Subproject d9d0a354b2bc9abcaf45acf2fa1b1b706f5d93c diff --git a/qtwebchannel b/qtwebchannel -Subproject 2fecfd77f9c22df1c25ebacc47d4cda9709e00b +Subproject 2090e6b7e89c5b387b8233afbf71cc44d044209 diff --git a/qtwebengine b/qtwebengine -Subproject 178d1b2f15e7c8a46bf859ca40303be0bb42305 +Subproject 8267f39752832926bb530ffd08b8eb83838ce98 diff --git a/qtwebsockets b/qtwebsockets -Subproject deb63e9046f9fd836a0c0af7e07e7a762ba3320 +Subproject 89fcf7eb3d4f24d01ed3130dac691042a99c72d diff --git a/qtwebview b/qtwebview -Subproject 6d9a29ba205b93e7139ba5fd7457f7a9930bf81 +Subproject ff0b2c681dfbf0aab8715e9e677779c078941f5 |