diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:15:40 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-15 13:24:54 +0200 |
commit | 5ef4ad5e90e86731542a5620dc500ec4da40c9d6 (patch) | |
tree | ee798e10633f87253b389410f2b5343582d29702 | |
parent | a2dc8d6c2141bce84fe9619d5ee6851e73de8a95 (diff) | |
parent | df53ff5f85f69932538cc1c571b86b0c2a885a10 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmakewip/cmake
Bringing in new SHA1s, and updated cmake-specific configurations.
Intended for Qt6 Installer essentials package creation.
Conflicts
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: I6abc2d952ae75785e34b70977e41018a72acf5bc
56 files changed, 393 insertions, 320 deletions
diff --git a/.gitmodules b/.gitmodules index d98947bf..ea697b07 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,8 +68,8 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = master - status = ignore + branch = dev + status = essential priority = 50 [submodule "qtlocation"] depends = qtbase @@ -127,11 +127,11 @@ status = addon [submodule "qt3d"] depends = qtbase - recommends = qtdeclarative qtimageformats qtgamepad + recommends = qtdeclarative qtshadertools path = qt3d url = ../qt3d.git branch = dev - status = ignore + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats diff --git a/coin/module_config.yaml b/coin/module_config.yaml new file mode 100644 index 00000000..96d20dd4 --- /dev/null +++ b/coin/module_config.yaml @@ -0,0 +1,27 @@ +version: 2 +accept_configuration: + condition: property + property: host.os + equals_property: target.os + +instructions: + Build: + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - type: MakeDirectory + directory: .git + - type: SetBuildDirectory + directory: "{{.SourceDir}}" + - type: ChangeDirectory + directory: "{{.BuildDir}}" + - type: ExecuteCommand + command: "{{.Env.ENV_PREFIX}} cmake {{.Env.CONFIGURE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{.InstallDir}} -DBUILD_TESTING=OFF {{.SourceDir}}" + executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution + maxTimeInSeconds: 6000 + maxTimeBetweenOutput: 1200 + userMessageOnFailure: > + Failed to call cmake. + + Test: + - type: EnvironmentVariable + variableName: Dummy + variableValue: dummy diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5fcc5821..c4be174a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -9,7 +9,7 @@ Configurations: Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' Features: ['Packaging'] - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -32,4 +32,9 @@ Configurations: Features: ['Packaging'] Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}']
\ No newline at end of file diff --git a/coin/platform_configs/qt3d.yaml b/coin/platform_configs/qt3d.yaml new file mode 100644 index 00000000..cf9d61c8 --- /dev/null +++ b/coin/platform_configs/qt3d.yaml @@ -0,0 +1,43 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtandroidextras.yaml b/coin/platform_configs/qtandroidextras.yaml new file mode 100644 index 00000000..cf9d61c8 --- /dev/null +++ b/coin/platform_configs/qtandroidextras.yaml @@ -0,0 +1,43 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 287ac3e1..59c84e4f 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -5,24 +5,10 @@ Configurations: Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' Features: ['DisableTests'] Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake -DQT_FEATURE_system_harfbuzz=OFF', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/../../environment-setup-armv7at2hf-neon-poky-linux-gnueabi', "QT_CMAKE_DIR=/opt/cmake-3.17.2/bin"] Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' -- Template: 'qtci-linux-openSUSE-15.1-x86_64' Target os: 'WebAssembly' Compiler: 'GCC' @@ -68,9 +54,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtcoap.yaml b/coin/platform_configs/qtcoap.yaml new file mode 100644 index 00000000..cf9d61c8 --- /dev/null +++ b/coin/platform_configs/qtcoap.yaml @@ -0,0 +1,43 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-openSUSE-15.1-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-macos-10.14-x86_64' + Compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' +- + Template: 'qtci-windows-10-x86_64-15' + Compiler: 'MSVC2019' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Compiler: 'GCC' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'GCC' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}'] +- + Template: 'qtci-macos-10.14-x86_64' + Target os: 'IOS_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] +- + Template: 'qtci-windows-7-x86-3' + Compiler: 'Mingw' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 777c6a4c..c6ea5fdc 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -1,34 +1,6 @@ Version: 2 Configurations: - - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Features: ['UseLegacyInstructions'] -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Features: ['UseLegacyInstructions'] -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'armv7' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose' - Features: ['UseLegacyInstructions'] -- - Template: 'qtci-linux-Ubuntu-18.04-x86_64' - Target os: 'QEMU' - Target arch: 'arm64' - Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake examples -nomake tests -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib -no-xcb' - Features: ['UseLegacyInstructions'] -- Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['UseLegacyInstructions'] @@ -48,7 +20,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -68,9 +40,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtdoc.yaml b/coin/platform_configs/qtdoc.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtdoc.yaml +++ b/coin/platform_configs/qtdoc.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtgraphicaleffects.yaml b/coin/platform_configs/qtgraphicaleffects.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtgraphicaleffects.yaml +++ b/coin/platform_configs/qtgraphicaleffects.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml index 3ca0b38b..ec8c3214 100644 --- a/coin/platform_configs/qtqa.yaml +++ b/coin/platform_configs/qtqa.yaml @@ -3,5 +3,5 @@ Configurations: - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtquickcontrols2.yaml b/coin/platform_configs/qtquickcontrols2.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtquickcontrols2.yaml +++ b/coin/platform_configs/qtquickcontrols2.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qttools.yaml b/coin/platform_configs/qttools.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qttools.yaml +++ b/coin/platform_configs/qttools.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qttranslations.yaml +++ b/coin/platform_configs/qttranslations.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index c5809149..906e0236 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -17,11 +17,6 @@ Configurations: Features: ['OutOfSourceBuild', 'Documentation', 'UseLegacyInstructions'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-warnings-are-errors -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - - Template: 'qtci-linux-SLES-15-x86_64' - Compiler: 'GCC' - Features: ['DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' -- Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index 26b05e8c..cf9d61c8 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -15,7 +15,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-15' Compiler: 'MSVC2019' - Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' + Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DBUILD_EXAMPLES=OFF -DBUILD_WITH_PCH=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..' - Template: 'qtci-linux-RHEL-7.6-x86_64' Compiler: 'GCC' @@ -35,9 +35,9 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl' - Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_UIKIT_SDK=iphoneos'] + Environment variables: ['TARGET_CONFIGURE_ARGS=-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS -DQT_FORCE_SIMULATOR_AND_DEVICE=ON'] - Template: 'qtci-windows-7-x86-3' Compiler: 'Mingw' - Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' + Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x86}}\.. -DFEATURE_system_zlib=OFF' Environment variables: ['Path={{.Env.MINGW810_i686}}\bin;{{.Env.Path}}'] diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 24a4d507..7592814b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,120 +33,79 @@ ## ############################################################################# +# shellcheck source=./DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + set -ex -# This script will install squish package for Linux and Mac. +# This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.5" -# Branch version without dot -qtBranch="513x" -squishFolder="/opt/squish" -squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" +version="6.5.2" +qtBranch="514x" +installFolder="/opt" +squishFolder="$installFolder/squish" +preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/.squish-3-license" if uname -a |grep -q Darwin; then - squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" +else + compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" + sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi -squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" -squishLicenseFile=".squish-3-license.tar.gz" - -testSuite="suite_test_squish" -testSuiteUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" +mountFolder="/tmp/squish" +sudo mkdir "$mountFolder" -# These checks can be removed when Vanilla OS for all linux and Mac are in -if [ -d "$squishFolder" ]; then - echo "Move old squish to /tmp" - sudo mv "$squishFolder" "/tmp/squish_$(date)" +# Check which platform +if uname -a |grep -q Darwin; then + usersGroup="staff" + squishLicenseDir="/Users/qt" +elif uname -a |grep -q "el7"; then + usersGroup="qt" + squishLicenseDir="/root" +elif uname -a |grep -q "Ubuntu"; then + usersGroup="users" + squishLicenseDir="/home/qt" +else + usersGroup="users" + squishLicenseDir="/root" fi -if [ -f "/etc/profile.d/squish_env.sh" ]; then - echo "Remove /etc/profile.d/squish_env.sh" - sudo rm -f "/etc/profile.d/squish_env.sh" - export SQUISH_LICENSEKEY_DIR=$HOME +targetFileMount="$mountFolder"/"$compressedFolder" + +echo "Mounting $preBuildCacheUrl to $mountFolder" +sudo mount "$preBuildCacheUrl" "$mountFolder" +echo "Create $installFolder if needed" +if [ ! -d "$installFolder" ]; then + sudo mkdir "$installFolder" fi -function MountAndInstall { - url=$1 - targetDirectory=$2 - targetFile=$3 - - # Check which platform - if uname -a |grep -q Darwin; then - usersGroup="staff" - mountFolder="/Volumes" - squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el7"; then - usersGroup="qt" - mountFolder="/tmp" - squishLicenseDir="/root" - elif uname -a |grep -q "Ubuntu"; then - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/home/qt" - else - usersGroup="users" - mountFolder="/tmp" - squishLicenseDir="/root" - fi +VerifyHash "$targetFileMount" "$sha1" - function UnMount { - echo "Unmounting $mountFolder" - sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - } +echo "Uncompress $compressedFolder" +sudo tar -xzf "$targetFileMount" --directory "$installFolder" - targetFileMount="$mountFolder"/"$targetFile" +echo "Unmounting $mountFolder" +sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" - echo "Mounting $url to $mountFolder" - sudo mount "$url" "$mountFolder" - echo "Create $targetDirectory if needed" - if [ ! -d "/opt" ]; then - sudo mkdir "/opt" - fi - if [ ! -d "$targetDirectory" ]; then - sudo mkdir "$targetDirectory" - fi - echo "Uncompress $targetFile" - if [[ $targetFile == *.tar.gz ]]; then - if [[ $targetFile == .squish-3-license.* ]]; then - target="$squishLicenseDir" - # Squish license need to be exists also in users home directory, because squish check it before it starts running tests - sudo tar -xzf "$targetFileMount" --directory "$HOME" - else - target="$targetDirectory" - fi - sudo tar -xzf "$targetFileMount" --directory "$target" - UnMount - elif [[ $targetFile == *.dmg ]]; then - echo "'dmg-file', no need to uncompress" - sudo cp $targetFileMount /tmp - UnMount - sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null - mountFolder="/Volumes/froglogic Squish" - UnMount - elif [[ $targetFile == *.run ]]; then - echo "'run-file', no need to uncompress" - sudo cp $targetFileMount $targetDirectory - UnMount - sudo chmod +x $targetDirectory/$targetFile - sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null - sudo rm -fr "$targetDirectory/$targetFile" - if uname -a |grep -q "Ubuntu"; then - sudo mkdir /usr/lib/tcl8.6 - sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ - fi - else - exit 1 +sudo mv "$installFolder/rta_squish_$version" "$squishFolder" + +if uname -a |grep -q "Ubuntu"; then + if [ ! -e "/usr/lib/tcl8.6" ]; then + sudo mkdir /usr/lib/tcl8.6 + sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi +fi - echo "Changing ownerships" - sudo chown -R qt:$usersGroup "$targetDirectory" - sudo chown qt:$usersGroup "$HOME/.squish-3-license" -} +DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" -echo "Set commands for environment variables in .bashrc" +echo "Changing ownerships" +sudo chown -R qt:$usersGroup "$squishFolder" +sudo chown qt:$usersGroup "$HOME/.squish-3-license" +echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile @@ -155,19 +114,11 @@ else echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc fi -echo "Installing squish license to home directory.." -MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" - -echo "Installing squish $version.." -MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" - -echo "Installing provisioning scripts for squish" -MountAndInstall "$testSuiteUrl" "$squishFolder" "$testSuite.tar.gz" - -echo "Verifying Squish Installation" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/$testSuite" | grep "Squish test run successfully" ; then +echo "Verifying Squish" +if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then echo "Squish installation tested successfully" else echo "Squish test failed! Package wasn't installed correctly." exit 1 fi + diff --git a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 index ee792896..17684575 100644 --- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -34,12 +34,12 @@ $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" -$mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" -$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" -$mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglSha1_64 = "0ed35efbc8112282be5d0c87c37fde2d15e81998" +$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version-signed.7z" +$mesaOpenglSha1_32 = "96bd6ca0d7fd249fb61531dca888965ffd20f53c" +$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version-signed.7z" +$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version-signed.7z" function Extract-Mesa { diff --git a/coin/provisioning/common/windows/nodejs.ps1 b/coin/provisioning/common/windows/nodejs.ps1 new file mode 100644 index 00000000..c56f6db6 --- /dev/null +++ b/coin/provisioning/common/windows/nodejs.ps1 @@ -0,0 +1,61 @@ +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## 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 http://www.qt.io/terms-conditions. For further +## information use the contact form at http://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 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + +# This script will install Node.js +# Needed by QtWebengine + +$version = "12.18.0" +$package = "C:\Windows\temp\nodejs-$version.zip" +$targetFolder = "C:\Utils\nodejs" +$arch = "$((Get-WmiObject Win32_Processor).AddressWidth)" +$externalUrl = "https://nodejs.org/dist/v$version/node-v$version-win-x$arch.zip" +$internalUrl = "http://ci-files01-hki.intra.qt.io/input/windows/node-v$version-win-x$arch.zip" + +if ( $arch -eq 64 ) { + $sha1 = "457b1527d249ee471a9445953a906cb10c75378d" +} else { + $sha1 = "58801900f5bddca9c00feed6b84fed729426fc92" + +} + +Write-Host "Installing Node.js" +Download $externalUrl $internalUrl $package +Verify-Checksum $package $sha1 +mkdir $targetFolder +Extract-7Zip $package $targetFolder +Add-Path $targetFolder +Remove $package + +Write-Output "Node.js = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index f8d600d7..8396743e 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2019 The Qt Company Ltd. +## Copyright (C) 2020 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,120 +33,48 @@ . "$PSScriptRoot\helpers.ps1" -# This script will install squish package for Windows. +# This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -# NOTE! Make sure 64bit versions are always installed before 32bit, -# because they use same folder name before a rename - -$version = "6.5" - -# Qt branch without dot (*.*) -$qtBranch = "513x" -# So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point -# the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. +$version = "6.5.2" +$qtBranch = "514x" $targetDir = "C:\Utils\squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" -$squishBranchUrl = "$squishUrl\$qtBranch" -$testSuite = "suite_test_squish" -$testSuiteUrl = "$squishUrl\$testSuite.7z" +$squishPackage = "C:\Utils\rta_squish" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license $licensePackage = ".squish-3-license" -$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName - -Function DownloadAndInstallSquish { - Param ( - [string]$version, - [string]$bit, - [string]$squishPackage - ) - $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" - $SquishInstaller = "$targetDir\$squishPackage.exe" - $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" +Write-Host "Installing Squish license to home directory" +Copy-Item $licenseUrl\$licensePackage ~\$licensePackage - Write-Host "Fetching from URL $squishUrl" - Copy-Item "$SquishUrl" "$SquishInstaller" - Write-Host "Installing Squish" - $stdoutFile = [System.IO.Path]::GetTempFileName() - $stderrFile = [System.IO.Path]::GetTempFileName() - Start-Process -FilePath "$SquishInstaller" -Wait -ArgumentList $SquishParameters -PassThru -RedirectStandardOutput $stdoutFile -RedirectStandardError $stderrFile | Out-Null - Remove-Item -Path $SquishInstaller - if ("$bit" -eq "win64") { - if ($squishPackage.StartsWith("mingw")) { - $squishPackage64bit = "mingw_64" - } else { - $squishPackage64bit = "$squishPackage`_64" - } - Rename-Item $targetDir\$squishPackage $targetDir\$squishPackage64bit - TestSquish $squishPackage64bit - } else { - if ($squishPackage.StartsWith("mingw")) { - Rename-Item $targetDir\$squishPackage $targetDir\mingw - TestSquish mingw - } else { - TestSquish $squishPackage - } - } +if (Is64BitWinHost) { + $arch = "x64" +} else { + $arch = "x86" } -Function DownloadSquishLicence { - Param ( - [string]$squishUrl - ) - - Write-Host "Installing Squish license to home directory" - Copy-Item $squishUrl\$licensePackage ~\$licensePackage -} - -Function TestSquish { - Param ( - [string]$squishPackage - ) - - Write-Host "Verifying Squish Installation" - if (cmd /c "$targetDir\$squishPackage\bin\squishrunner.exe --testsuite $targetDir\$testSuite" |Select-String -Pattern "Squish test run successfully") { - Write-Host "Squish installation tested successfully!" - } else { - Write-Host "Squish test failed! $squishPackage wasn't installed correctly." - [Environment]::Exit(1) - } -} - -Write-Host "Creating $targetDir" -New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" - -Write-Host "Download and install Test Suite for squish" -Copy-Item $testSuiteUrl $targetDir/$testSuite.7z -Extract-7Zip $targetDir/$testSuite.7z $targetDir - -DownloadSquishLicence $squishUrl +$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName if ($OSVersion -eq "Windows 10 Enterprise") { - + $winVersion = "win10" if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - DownloadAndInstallSquish $version win64 "msvc141" - DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - } - DownloadAndInstallSquish $version win32 "msvc141" - -} elseif ($OSVersion -eq "Windows 8.1 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" + $sha1 = "0763b344afa327e6c374971492021c5e923be892" } - DownloadAndInstallSquish $version win32 "msvc141" - } elseif ($OSVersion -eq "Windows 7 Enterprise") { - - if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc14" - } else { - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - } - DownloadAndInstallSquish $version win32 "msvc141" + $winVersion = "win7" + $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" } +$squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" + +Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Verify-Checksum "C:\Utils\$squishArchive" $sha1 +Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" +Rename-Item "$squishPackage" "$targetDir" + +Write-Host "Verifying Squish Installation for following targets:" +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName } +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } } diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh index 32a48976..2056df70 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/04-install-packages.sh @@ -87,6 +87,8 @@ installPackages+=(pulseaudio-libs-devel) installPackages+=(libXtst-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) +installPackages+=(rh-nodejs12-nodejs) +installPackages+=(rh-nodejs12-nodejs-devel) # For Android builds installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 9aec5d67..dfae2e8b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -84,6 +84,9 @@ installPackages+=(libudev-dev) installPackages+=(libegl1-mesa-dev) installPackages+=(libfontconfig1-dev) installPackages+=(libxss-dev) +installPackages+=(nodejs) +# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev. + # Common event loop handling installPackages+=(libglib2.0-dev) # MySQL support diff --git a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh index 9da9ed0f..8f80518d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.1-x86_64/02-zypperpackages.sh @@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel libicu60_2 # qtwebengine sudo zypper -nq install alsa-devel dbus-1-devel \ libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ - mozilla-nspr-devel mozilla-nss-devel + mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel # qtwebkit sudo zypper -nq install libxml2-devel libxslt-devel @@ -50,3 +50,4 @@ sudo zypper -nq install cups-devel #speech-dispatcher sudo zypper -nq install libspeechd-devel + diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh new file mode 100755 index 00000000..ab992405 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-nodejs.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +brew install nodejs + diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 new file mode 100644 index 00000000..6032e945 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/03-nodejs.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\nodejs.ps1" diff --git a/qt3d b/qt3d -Subproject c2ea752f684290d156c500c6a7174fe3f27fa08 +Subproject eefd4511d5d59045d3ac079b319e01dfca2334a diff --git a/qt5compat b/qt5compat -Subproject 1b89298d25a4c575226bedaf7e1f2f49b1babc7 +Subproject c1dbd110fb4e31407019539737efdf76f8b96ed diff --git a/qtandroidextras b/qtandroidextras -Subproject a41d6999eaca5513363232f039f843bef9de473 +Subproject 1af58292717c0a087c264461914c32d686e1644 diff --git a/qtbase b/qtbase -Subproject 794150e5bda0c203a5373c3fa2f9785f9941f6d +Subproject 3f6142f5a1a01f201593f6711930ec77640dea4 diff --git a/qtdeclarative b/qtdeclarative -Subproject 24abd0d14ebd420c275fa4e49ddb1a43b441c74 +Subproject 185d9b5b72a2c062c4670b17385ec1e6e576c4d diff --git a/qtdoc b/qtdoc -Subproject 4128b5005ce01ff6948775f5476ee759677bde4 +Subproject 70fe807b6bd1824cf6d611768101ea520178335 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject fb53552f5e97b54442e7e83020972a13e332902 +Subproject 4860a37352c9ef346d08e0be34c75dfc3dd71ad diff --git a/qtimageformats b/qtimageformats -Subproject c75f5c0acfff3435b38a2ee96eabacf0c3feae9 +Subproject 11a02369f88be6185c4164c7080b2f981b5f055 diff --git a/qtnetworkauth b/qtnetworkauth -Subproject 8ad171f5074ee65b7017402110ef35107f9a722 +Subproject 8871b49566b4fab10a02570b7ec2aebef282528 diff --git a/qtqa b/qtqa -Subproject c1917763a500cf9606a5b638410c62824ec06fb +Subproject b7329ba80d98e592c77c78c5606d298f77c2206 diff --git a/qtquick3d b/qtquick3d -Subproject f0bea57820951435e44b1e1aa113617bdcc5962 +Subproject 29fe880ffa8efc3debe01677df15fbac2c2f157 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject 4e1e01c4e484337586a7419e28c3625055f8803 +Subproject 4f3ebbedc79ae4d9f3031c8d1e8176eee82ee20 diff --git a/qtquicktimeline b/qtquicktimeline -Subproject a488cb1cc0d53059583407f7db52ae7fd8975d0 +Subproject b31b12c64e15d34e7189dba5c15707f29380744 diff --git a/qtrepotools b/qtrepotools -Subproject c7cccea498425db98ad276d5b43ddb1148f8892 +Subproject 050705f615e5c54acc7d2c1190d2d997a0d1c3c diff --git a/qtshadertools b/qtshadertools -Subproject d8aa3fb504723a2ebf54d0eae5c5e6b633826b3 +Subproject 04c6c7064d9ae1407d42ea2cde6cad63a2f7c84 diff --git a/qtsvg b/qtsvg -Subproject f8f067f1d8fd9b07039f91df1c784ee25f71ef2 +Subproject c28211d4f86731c3e24475a13b7bef6fe36f4fd diff --git a/qttools b/qttools -Subproject 2495c48a93fe0771ee59777a47071d19062d9e4 +Subproject 4fc0c5c783f58e556cd88312556fbafdccc23cb diff --git a/qttranslations b/qttranslations -Subproject e30abf5b4bc6bac19c78610ca80defc4daa629f +Subproject de232ed1977a03f7bc4f99f1d60d924cf41a420 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard -Subproject 18a30053f3edcb1f65f6a174129299ecae9c521 +Subproject b5306fad3c1bf399f9f4d78b4dd42611e4370fd diff --git a/qtwayland b/qtwayland -Subproject dcd0aa6b31623ee6e2ef50a3c5aaef7054f8d6a +Subproject 0c295a654c4c4a251794a4079d9a92d6305189a diff --git a/qtwebsockets b/qtwebsockets -Subproject 9486a8053edd0eab68a03178effebda0d519460 +Subproject 1bb87f7da8db6f727f54e230b43dde2c3c5c504 |