diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2021-09-29 16:36:46 +0300 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@qt.io> | 2021-11-15 09:24:18 +0200 |
commit | 6cda40d952fd42b0e5eaf27040791c2428663712 (patch) | |
tree | 6905b54aad6bf500c44d67e010318fd9c09087c4 | |
parent | 70c27d6e69622bba2505719067498549bfaf3d30 (diff) |
Replace MinGW 8.1 with MinGW 11.2.0 in CI
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW
In 6.2 branch Packaging targets needs to be as parallel
first. MinGW 8.1 can be removed ones Releasing team has
done needed script changes
Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit ce9ef403661f140bc676995875171750c5013d00)
10 files changed, 175 insertions, 16 deletions
diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index be3b4d5c..2b84cb3d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -131,6 +131,18 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' ] - + 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' + Environment variables: [ + 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}' + ] +- Id: 'Windows10-LLVM-x64-host' Template: 'qtci-windows-10-x86_64-52' Compiler: 'Clang' @@ -141,8 +153,8 @@ Configurations: - Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] + Environment variables: ['PATH=C:\MINGW1120\mingw64\bin;$PATH'] 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache' - Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_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 3a3205c8..9bdaf9d4 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -15,6 +15,18 @@ 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10-x86_64-52' + Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' @@ -27,6 +39,18 @@ Configurations: - 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10-x86_64-52' + Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'Mingw' Target compiler: 'Clang' @@ -39,6 +63,18 @@ Configurations: - 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + Template: 'qtci-windows-10-x86_64-52' + Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'Mingw' Target compiler: 'Clang' @@ -48,3 +84,15 @@ Configurations: '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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] +- + 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 9daeeb39..3a8669f7 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -23,6 +23,18 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -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: [ + '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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_pkg_config=OFF'] +- Template: 'qtci-macos-10.14-x86_64' Target os: 'WebAssembly' Compiler: 'Clang' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 370db670..396776d6 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -3,7 +3,7 @@ Configurations: - Template: 'qtci-windows-10-x86_64-52' Compiler: 'Mingw' - Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH'] + 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'] - @@ -13,6 +13,12 @@ Configurations: 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-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-linux-RHEL-8.2-x86_64-50' Compiler: 'GCC' Features: ['Packaging', 'DisableTests', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 13284559..2a0e5b2d 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -6,3 +6,9 @@ Configurations: Environment variables: ['PATH=C:\MINGW810_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-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' diff --git a/coin/provisioning/common/windows/install-mingw-810.ps1 b/coin/provisioning/common/windows/install-mingw-810.ps1 new file mode 100644 index 00000000..aadc8c46 --- /dev/null +++ b/coin/provisioning/common/windows/install-mingw-810.ps1 @@ -0,0 +1,68 @@ +############################################################################ +## +## 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/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index aadc8c46..6fd3de24 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2021 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -37,23 +37,19 @@ function InstallMinGW { Param ( [string] $release = $(BadParam("release file name")), - [string] $sha1 = $(BadParam("SHA1 checksum of the file")), - [string] $suffix = "" + [string] $sha1 = $(BadParam("SHA1 checksum of the file")) ) - $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') + $null, $null, $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" + if ($arch -eq "x86_64") { $win_arch = "Win64" } + $envvar = "MINGW$version" $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" + $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" - Download $url_official $url_cache $mingwPackage + Download $url_cache $url_cache $mingwPackage Verify-Checksum $mingwPackage $sha1 Extract-7Zip $mingwPackage $TARGETDIR diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 new file mode 100644 index 00000000..921bf23b --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw1120_64.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 11.2.0 +# Note! MinGW version is 9.0.0 but the GCC version is 11.2 which is used with the naming of MinGW + +$release = "mingw-w64-x86_64-11.2.0-release-posix-seh-rt_v9-rev1" + +$sha1 = "5554791dc13468bf44e2e519c6691f2deecd000c" + +InstallMinGW $release $sha1 + 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 index fa8edb85..3883087d 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw-810.ps1" # This script will install MinGW 8.1.0 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 index b712c2b3..2a7dd44a 100644 --- 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 @@ -1,4 +1,4 @@ -. "$PSScriptRoot\..\common\windows\install-mingw.ps1" +. "$PSScriptRoot\..\common\windows\install-mingw-810.ps1" # This script will install 64-bit MinGW 8.1.0 |