diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e6cbccfb..13103eef 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -205,13 +205,13 @@ Configurations: 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - - Id: 'windows-10_22h2-mingw11' + Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', @@ -244,26 +244,26 @@ Configurations: 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', ] - - Id: 'windows-10_22h2-mingw11-developer-build' + Id: 'windows-10_22h2-mingw13-developer-build' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] - - Id: 'windows-11_22h2-mingw11-developer-build' + Id: 'windows-11_22h2-mingw13-developer-build' Template: 'qtci-windows-11_22H2-x86_64-51' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 609b6061..89f85eb1 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -22,10 +22,10 @@ Configurations: Target arch: 'armv7' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw11' + Platform dependency: 'windows-10_22h2-mingw13' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a2e1fe10..b3e12377 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -18,10 +18,10 @@ Configurations: Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' - Platform dependency: 'windows-10_22h2-mingw11' + Platform dependency: 'windows-10_22h2-mingw13' Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] Environment variables: [ - 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', + 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index b5407b9c..6bd99bc3 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -14,8 +14,8 @@ Include: [ "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", "rhel-8.8", - "windows-10_22h2-mingw11", - "windows-10_22h2-mingw11-developer-build", + "windows-10_22h2-mingw13", + "windows-10_22h2-mingw13-developer-build", "windows-10_22h2-llvm", "windows-11_22h2-msvc2019" ], diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 7ebef271..84746b6b 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -2,7 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.8', - 'windows-10_22h2-mingw11', + 'windows-10_22h2-mingw13', 'ubuntu-22.04-documentation', 'ubuntu-22.04-documentation-x11-tests' ], diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 9bf203ba..82421784 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -65,7 +65,7 @@ function InstallFfmpeg { } function InstallMingwFfmpeg { - $mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW1120", [System.EnvironmentVariableTarget]::Machine) + $mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW_PATH", [System.EnvironmentVariableTarget]::Machine) return InstallFfmpeg -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" } diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1 index bf64e460..d42eeaab 100644 --- a/coin/provisioning/common/windows/install-mingw.ps1 +++ b/coin/provisioning/common/windows/install-mingw.ps1 @@ -10,14 +10,18 @@ function InstallMinGW [string] $sha1 = $(BadParam("SHA1 checksum of the file")) ) - $null, $null, $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') + if ($release -like "*11.2.0*") { + $null, $null, $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-') + $url_original = "https://github.com/cristianadam/mingw-builds/releases/download/v" + $version + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" + } + else { + $null, $null, $arch, $version, $null, $threading, $ex_handling, $runtime_library, $build_ver, $revision = $release.split('-') + $url_original = "https://github.com/niXman/mingw-builds-binaries/releases/download/" + $version + "-" + $build_ver + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $runtime_library + "-" + $build_ver + "-" + $revision + ".7z" + } if ($arch -eq "x86_64") { $win_arch = "Win64" } - $envvar = "MINGW$version" - $envvar = $envvar -replace '["."]' + $envvar = "MINGW_PATH" $targetdir = "C:\$envvar" - - $url_original = "https://github.com/cristianadam/mingw-builds/releases/download/v" + $version + "-" + $revision + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z" $url_cache = "https://ci-files01-hki.ci.qt.io/input/windows/" + $release + ".7z" $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip" Download $url_original $url_cache $mingwPackage diff --git a/coin/provisioning/common/windows/protobuf.ps1 b/coin/provisioning/common/windows/protobuf.ps1 index 2fc07443..c0f7b257 100644 --- a/coin/provisioning/common/windows/protobuf.ps1 +++ b/coin/provisioning/common/windows/protobuf.ps1 @@ -82,7 +82,7 @@ Push-Location $targetDir ### MinGW # Check if mingw is where we expect it to be and add it to path: -$mingwPath = "C:\MINGW1120\mingw64\bin" +$mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW_PATH", [System.EnvironmentVariableTarget]::Machine) + "\bin" if (!(Test-Path $mingwPath)) { throw "Cannot find mingw in $mingwPath, something is configured wrong" } diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1120_64.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1120_64.ps1 deleted file mode 100644 index e23cec73..00000000 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1120_64.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -. "$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-rev3" - -$sha1 = "50174112ceca6f9fe42debbedda54ce6e9187302" - -InstallMinGW $release $sha1 - diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1310_64.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1310_64.ps1 new file mode 100644 index 00000000..ef8e0a50 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/09-install-mingw1310_64.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 13.1.0 +# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW + +$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1" + +$sha1 = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48" + +InstallMinGW $release $sha1 + diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1120_64.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1120_64.ps1 deleted file mode 100644 index e23cec73..00000000 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1120_64.ps1 +++ /dev/null @@ -1,11 +0,0 @@ -. "$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-rev3" - -$sha1 = "50174112ceca6f9fe42debbedda54ce6e9187302" - -InstallMinGW $release $sha1 - diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1310_64.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1310_64.ps1 new file mode 100644 index 00000000..ef8e0a50 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/09-install-mingw1310_64.ps1 @@ -0,0 +1,11 @@ +. "$PSScriptRoot\..\common\windows\install-mingw.ps1" + +# This script will install 64-bit MinGW 13.1.0 +# Note! MinGW version is 9.0.0 but the GCC version is 13.1 which is used with the naming of MinGW + +$release = "MinGW-w64-x86_64-13.1.0-release-posix-seh-msvcrt-rt_v11-rev1" + +$sha1 = "561db0989c1b2cb73e0ceb27aed3b0ee8cb1db48" + +InstallMinGW $release $sha1 +