aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2022-01-12 09:19:19 +0200
committerHeikki Halmet <heikki.halmet@qt.io>2022-01-12 11:59:56 +0200
commitdc05a9ead6d45c3c6bd4c58c13021967f0986522 (patch)
treed11e8368664ebe89e907e739e079d306da55a6cd
parentafa2f46691745eef09c48c48f2ce7a3ad42a2f7a (diff)
Remove old Windows 10 targets
Windows 10 21H2 is now significant in and can replace older windows 10 version. Also packaging side is already using the latest version Task-number: QTQAINFRA-4539 Change-Id: Ieec69d64d7feaad8c926e07ed1785c741bafd885 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--coin/platform_configs/cmake_platforms.yaml55
-rw-r--r--coin/platform_configs/cmake_platforms_target_android_host_windows.yaml47
-rw-r--r--coin/platform_configs/cmake_platforms_wasm.yaml13
3 files changed, 0 insertions, 115 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml
index 17f15cd4..e6841097 100644
--- a/coin/platform_configs/cmake_platforms.yaml
+++ b/coin/platform_configs/cmake_platforms.yaml
@@ -54,15 +54,6 @@ Configurations:
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-11_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease", 'InsignificantTests']
@@ -99,32 +90,12 @@ Configurations:
'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'
--
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'
-
- 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}}',
- 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
- 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
- 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
- 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
- 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64'
- ]
--
Id: 'Windows11_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'MSVC2019'
@@ -180,17 +151,6 @@ Configurations:
'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}}'
- ]
--
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
@@ -202,14 +162,6 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_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 -DBUILD_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: 'Windows11_21H2-LLVM-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'Clang'
@@ -226,13 +178,6 @@ Configurations:
Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
- Template: 'qtci-windows-10-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 -DBUILD_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}}']
--
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache', 'InsignificantTests']
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 2a387423..30d8613d 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml
@@ -1,17 +1,6 @@
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',
- ]
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'arm64'
@@ -24,18 +13,6 @@ Configurations:
'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',
]
-
- 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',
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
@@ -48,18 +25,6 @@ Configurations:
'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',
]
-
- 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',
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86'
@@ -72,18 +37,6 @@ Configurations:
'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',
]
-
- 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',
-]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml
index eeb84c7b..64c28f3a 100644
--- a/coin/platform_configs/cmake_platforms_wasm.yaml
+++ b/coin/platform_configs/cmake_platforms_wasm.yaml
@@ -11,19 +11,6 @@ Configurations:
'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',
- '-DFEATURE_pkg_config=OFF'
- ]
--
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'Mingw'