summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoni Jantti <joni.jantti@qt.io>2018-02-20 14:51:05 +0200
committerLiang Qi <liang.qi@qt.io>2018-04-18 18:16:22 +0000
commit34cf0234b9fa47cedacd2c2408f80b3bbf1c12c1 (patch)
treeb8420d94e20976146b62f6a2e4354c3be507293b
parent18b2d88dd5215a871104712acafdcb4f47ac9c86 (diff)
Provisioning: Win10 - Add Squish for mingw53
RTA requires Squish for mingw53 on Windows 10 machines for testing. Task-number: QTQAINFRA-1729 Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8 (cherry picked from commit 5e31866727b4485f07a17295277be889305c4b3b) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
-rw-r--r--coin/provisioning/common/windows/squishInstall.ps16
1 files changed, 6 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1
index 7a5824df..9128c683 100644
--- a/coin/provisioning/common/windows/squishInstall.ps1
+++ b/coin/provisioning/common/windows/squishInstall.ps1
@@ -107,6 +107,12 @@ DownloadSquishLicence $licensePackage $squishUrl $targetDir
if(($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise"))
{
+ # Squish for MinGW
+ $squishPackageMingw = "mingw_gcc53_posix_dwarf"
+ echo "Installing $squishPackageMingw"
+ DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw
+ mv $targetDir\$squishPackageMingw $targetDir\mingw
+
# Squish for Visual Studio 2015
$squishPackage = "msvc14"
$squishPackage64bit = "msvc14_64"