summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Donchevskii <ivan.donchevskii@qt.io>2019-04-05 10:12:36 +0200
committerEike Ziller <eike.ziller@qt.io>2019-04-08 06:36:50 +0000
commit338fce191ac1e14b9365068021b4f7ec7ad50646 (patch)
tree213f3fd24b02190eeb02b2e07f043c5977e79799
parentb2afcc84055a7d1fe8c8ede56961d52e19782a04 (diff)
Provisioning: Install i686 mingw on Windows 10 X64
Required to compile 32-bit binaries. Fixes: QTQAINFRA-2896 Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
-rw-r--r--coin/provisioning/common/windows/install-mingw.ps15
-rw-r--r--coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps111
2 files changed, 14 insertions, 2 deletions
diff --git a/coin/provisioning/common/windows/install-mingw.ps1 b/coin/provisioning/common/windows/install-mingw.ps1
index 8b7fe41d..bc05ba91 100644
--- a/coin/provisioning/common/windows/install-mingw.ps1
+++ b/coin/provisioning/common/windows/install-mingw.ps1
@@ -37,7 +37,8 @@ function InstallMinGW
{
Param (
[string] $release = $(BadParam("release file name")),
- [string] $sha1 = $(BadParam("SHA1 checksum of the file"))
+ [string] $sha1 = $(BadParam("SHA1 checksum of the file")),
+ [string] $suffix = ""
)
$arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
@@ -45,7 +46,7 @@ function InstallMinGW
if ($arch -eq "i686") { $win_arch = "Win32" }
elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
- $envvar = "MINGW$version"
+ $envvar = "MINGW$version$suffix"
$envvar = $envvar -replace '["."]'
$targetdir = "C:\$envvar"
$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
new file mode 100644
index 00000000..5401b36a
--- /dev/null
+++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw730.ps1
@@ -0,0 +1,11 @@
+. "$PSScriptRoot\..\common\windows\install-mingw.ps1"
+
+# This script will install MinGW 7.3.0
+
+$release = "i686-7.3.0-release-posix-dwarf-rt_v5-rev0"
+$sha1 = "96e11c754b379c093e1cb3133f71db5b9f3e0532"
+$suffix = "_i686"
+
+InstallMinGW $release $sha1 $suffix
+
+