diff options
author | Joni Jäntti <joni.jantti@qt.io> | 2017-09-26 13:04:49 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-28 19:11:21 +0000 |
commit | f90790b3edf6b054d7269127ed3a9f1b9bdb63b5 (patch) | |
tree | 224adcfe62dae7fead67f35468507dd08849f891 | |
parent | dc66b1f7e1cb57d9dc2d8e15decad30b83ec91f0 (diff) |
MinGW provisioning to 64-bit from 32-bit
We are switching to 64-bit MinGW targets in 5.11 branch.
Task-number: QTQAINFRA-1432
Change-Id: Ic806e0e6400ae98351a922ed7f5a545046273ada
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
3 files changed, 7 insertions, 7 deletions
diff --git a/coin/provisioning/common/install-mingw.ps1 b/coin/provisioning/common/install-mingw.ps1 index f835059a..cabc906c 100644 --- a/coin/provisioning/common/install-mingw.ps1 +++ b/coin/provisioning/common/install-mingw.ps1 @@ -58,7 +58,7 @@ function InstallMinGW Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"} echo "Adding MinGW environment variable." - [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine) + [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw" + $win_arch.Substring($win_arch.get_Length()-2), [EnvironmentVariableTarget]::Machine) echo "Cleaning $mingwPackage.." Remove-Item -Recurse -Force "$mingwPackage" diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 index 7c4cd8ac..18f67d66 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw530.ps1 @@ -1,9 +1,9 @@ . "$PSScriptRoot\..\common\install-mingw.ps1" -# This script will install MinGW 5.3.0 +# This script will install 64-bit MinGW 5.3.0 -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" +$release = "x86_64-5.3.0-release-posix-seh-rt_v4-rev0" +$sha1 = "7EB12DD3EDDCF609722C9552F8592BD9948DA1FC" InstallMinGW $release $sha1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 index e11f2310..490d1f10 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/09-install-mingw630.ps1 @@ -1,8 +1,8 @@ . "$PSScriptRoot\..\common\install-mingw.ps1" -# This script will install MinGW 6.3.0 +# This script will install 64-bit MinGW 6.3.0 -$release = "i686-6.3.0-release-posix-dwarf-rt_v5-rev2" -$sha1 = "AABEFF22DC3800FCFDB29144BFB08B0B728C476B" +$release = "x86_64-6.3.0-release-posix-seh-rt_v5-rev2" +$sha1 = "49E7F8997E3D15C75B1A4DE1C380ABE1FB9B7533" InstallMinGW $release $sha1 |