Update MinGW 7.3.0 to Mingw 8.1.0

Task-number: QTQAINFRA-3304 Change-Id: I4a962c112f4925224e91c08117c7324112d70729 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-22 10:34:44 +00:00 · 2019-10-22 10:34:44 +00:00 · 2b7355e69c
parent 2bf281229a
commit 2b7355e69c
7 changed files with 60 additions and 12 deletions
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@ -1,5 +1,4 @@
 Version: 2
-Module only: True
 Configurations:
 -
    Template: 'qtci-windows-10-x86_64-16'
@ -8,7 +7,8 @@ Configurations:
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% -qt-zlib'
 -
    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ -qt-zlib'
 -
    Template: 'qtci-windows-10-x86_64-16'
--- a/coin/platform_configs/qt5.yaml
+++ b/coin/platform_configs/qt5.yaml
@ -1,3 +1,5 @@
+Version: 2
+Configurations:
 -
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WinRT_10'
@ -13,12 +15,14 @@
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -debug-and-release -nomake tests -nomake examples -force-debug-info -no-sql-mysql -platform win32-msvc2019 -xplatform winrt-x86-msvc2019 -qt-zlib'
 -
    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++ QMAKE_LFLAGS_APP+=-s -qt-zlib'
 -
    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -force-debug-info -separate-debug-info -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 -qt-zlib'
 -
@ -38,7 +42,8 @@
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'Android_ANY'
    Target arch: 'multi'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Target compiler: 'Clang'
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20 -qt-zlib'
@ -61,21 +66,24 @@
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'armv7'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-armle-v7-qcc -qt-zlib'
 -
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'armv8'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -opengl es2 -nomake tests -nomake examples -no-sql-mysql -xplatform qnx-aarch64le-qcc -qt-zlib'
 -
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'QNX_700'
    Target arch: 'x86_64'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\Program Files\Git\bin;C:\MINGW810\mingw64\bin;$PATH;C:\qnx700\host\win64\x86_64\usr\bin;C:\qnx700\.qnx\bin', 'MAKEFLAGS=-j4 -Ic:\qnx700\target\qnx7\usr\include', 'QNX_CONFIGURATION=c:/qnx700/.qnx', 'QNX_CONFIGURATION_EXCLUSIVE=c:/qnx700/.qnx', 'QNX_TARGET=c:/qnx700/target/qnx7', 'QNX_HOST=c:/qnx700/host/win64/x86_64', 'LIB=""', 'INCLUDE=""']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -extprefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -opengl es2 -xplatform qnx-x86-64-qcc -qt-zlib'
 -
@ -95,7 +103,8 @@
 -
    Template: 'qtci-windows-10-x86_64-16'
    Target os: 'WebAssembly'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten -qt-zlib'
 -
--- a/coin/platform_configs/qtsaferenderer.yaml
+++ b/coin/platform_configs/qtsaferenderer.yaml
@ -1,10 +1,14 @@
+Version: 2
+Configurations:
 -
    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Configure arguments: '-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++'
 -
    Template: 'qtci-windows-10-x86_64-16'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-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++'
 -
--- a/coin/platform_configs/qtwebkit.yaml
+++ b/coin/platform_configs/qtwebkit.yaml
@ -1,5 +1,8 @@
+Version: 2
+Configurations:
 -
    Template: 'qtci-windows-7-x86-3'
-    Compiler: 'Mingw73'
+    Compiler: 'Mingw'
+    Environment variables: ['PATH=C:\MINGW810_i686\mingw32\bin;$PATH']
    Features: ['Packaging', 'DisableTests']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
--- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw810.ps1
@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.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
+
+
--- 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
@ -0,0 +1,10 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.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
+
--- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw810.ps1
@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.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
+
+