diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-12-09 16:14:39 +0200 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2021-12-13 16:09:17 +0200 |
commit | 51a3872d8534fcae78d115e20c9389208ca61b00 (patch) | |
tree | 2ef7bfc37acb61357675b84ebb677cc466d8a81b | |
parent | 6ba9bb865fc8696264d2b7f733fc0316d4a3a83d (diff) |
Remove MinGW 8 targets and provisioning scripts
MinGW 11 is already in use
Task-number: QTBUG-93479
Change-Id: Ibdb356831c2b1e458d17059be9bff323e814c6e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
6 files changed, 0 insertions, 169 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 19b572ac..47561e5a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -143,18 +143,6 @@ Configurations: 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang' ] - - Id: 'Windows10-Mingw8-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.MINGW810}}\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-Mingw11-x64-host' Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' 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 b7bc4bfd..c58ed04b 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -6,20 +6,6 @@ Configurations: Target arch: 'arm64' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw8-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - Environment variables: [ - 'Path={{.Env.MINGW810}}\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-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: [ @@ -32,20 +18,6 @@ Configurations: Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw8-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - Environment variables: [ - 'Path={{.Env.MINGW810}}\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-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: [ @@ -58,20 +30,6 @@ Configurations: Target arch: 'x86' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw8-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - Environment variables: [ - 'Path={{.Env.MINGW810}}\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-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: [ @@ -84,20 +42,6 @@ Configurations: Target arch: 'x86_64' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw8-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - Environment variables: [ - 'Path={{.Env.MINGW810}}\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-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: [ diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index c1023d01..c977c83e 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -15,18 +15,6 @@ Configurations: Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'Windows10-Mingw8-x64-host' - Features: ['Packaging', 'Sccache', 'DisableTests'] - Environment variables: [ - 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW810}}\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-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'Mingw' - Target compiler: 'Clang' Platform dependency: 'Windows10-Mingw11-x64-host' Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ diff --git a/coin/provisioning/common/windows/install-mingw-810.ps1 b/coin/provisioning/common/windows/install-mingw-810.ps1 deleted file mode 100644 index aadc8c46..00000000 --- a/coin/provisioning/common/windows/install-mingw-810.ps1 +++ /dev/null @@ -1,68 +0,0 @@ -############################################################################ -## -## Copyright (C) 2017 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" - -function InstallMinGW -{ - Param ( - [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")), - [string] $suffix = "" - ) - - $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') - - if ($arch -eq "i686") { $win_arch = "Win32" } - elseif ($arch -eq "x86_64") { $win_arch = "Win64" } - - $envvar = "MINGW$version$suffix" - $envvar = $envvar -replace '["."]' - $targetdir = "C:\$envvar" - $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" - $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" - - $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" - Download $url_official $url_cache $mingwPackage - Verify-Checksum $mingwPackage $sha1 - - Extract-7Zip $mingwPackage $TARGETDIR - - Set-EnvironmentVariable "$envvar" ("$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2)) - - Write-Host "Cleaning $mingwPackage.." - Remove "$mingwPackage" - - Write-Output "MinGW = $version $release" >> ~\versions.txt - -} diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 deleted file mode 100644 index 3883087d..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-mingw-810.ps1" - -# This script will install MinGW 8.1.0 - -$release = "i686-8.1.0-release-posix-dwarf-rt_v6-rev0" -$sha1 = "dd4f34f473e84c79b6b446adb3a5fac7919ba9cb" -$suffix = "_i686" - -InstallMinGW $release $sha1 $suffix - - diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 deleted file mode 100644 index 2a7dd44a..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810_64.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-mingw-810.ps1" - -# This script will install 64-bit MinGW 8.1.0 - -$release = "x86_64-8.1.0-release-posix-seh-rt_v6-rev0" - -$sha1 = "5aa456654a6ce77249c27888b5d0f856fc011b9c" - -InstallMinGW $release $sha1 - |