From ac2bdfb93a84f07d3fb4ed9edce8409dcabcac1c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 1 Feb 2022 15:06:49 +0200 Subject: Remove old Windows 10 targets Windows 10 21H2 is now significant for all targets Pick-to: 6.3 Task-number: QTQAINFRA-4539 Change-Id: I9435c11f7df6b7c2c77a5af10ebc5e0da5717ccb Reviewed-by: Oliver Wolff --- coin/platform_configs/cmake_platforms.yaml | 46 ------------------ ...make_platforms_target_android_host_windows.yaml | 56 ---------------------- coin/platform_configs/cmake_platforms_wasm.yaml | 12 ----- coin/platform_configs/qt-creator.yaml | 7 --- coin/platform_configs/qtsaferenderer.yaml | 6 --- coin/platform_configs/qtwebkit.yaml | 6 --- 6 files changed, 133 deletions(-) (limited to 'coin/platform_configs') diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b745c5ed..3dabced7 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -53,14 +53,6 @@ Configurations: 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}}' -- - Template: 'qtci-windows-10-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}}\..' - Environment variables: [ - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -96,25 +88,6 @@ Configurations: 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] -- - Id: 'Windows10-MSVC2019-x64-host' - Template: 'qtci-windows-10-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' -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2019' - Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging'] - Platform dependency: 'Windows10-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}}', - '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}}'] - Id: 'Windows10_21H2-MSVC2019-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' @@ -173,17 +146,6 @@ Configurations: 'NON_QTBASE_TARGET_CONFIGURE_ARGS=', 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'] -- - Id: 'Windows10-Mingw11-x64-host' - Template: 'qtci-windows-10-x86_64-52' - 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}}\..' - Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', - 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] - Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' @@ -195,14 +157,6 @@ Configurations: 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] -- - Id: 'Windows10-LLVM-x64-host' - Template: 'qtci-windows-10-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 -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'] - Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' 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 53691a97..05e28ac6 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -1,19 +1,5 @@ Version: 2 Configurations: -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - 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', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' - ] - Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' @@ -28,20 +14,6 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' ] -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'armv7' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - 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', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' - ] - Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' @@ -56,20 +28,6 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' ] -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - 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', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' - ] - Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' @@ -84,20 +42,6 @@ Configurations: 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' ] -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - 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', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang' - ] - Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'Android_ANY' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 07ca747a..a161f706 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -10,18 +10,6 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', ] -- - Template: 'qtci-windows-10-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'Mingw' - Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw11-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - 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'] - Template: 'qtci-windows-10_21H2-x86_64-51' Target os: 'WebAssembly' diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 52ac445f..5bb538e4 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -1,13 +1,6 @@ Version: 2 Module only: True Configurations: -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] - Configure arguments: '' - Environment variables: [] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 795bd26d..fde65967 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -6,12 +6,6 @@ Configurations: Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -nomake tests -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++' Features: ['UseLegacyInstructions'] -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] - Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 7866010b..c6e10e45 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,11 +1,5 @@ Version: 2 Configurations: -- - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] - Features: ['Packaging', UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -platform win32-g++ QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'Mingw' -- cgit v1.2.3