diff options
| author | Simo Fält <simo.falt@qt.io> | 2018-01-05 14:33:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-08-26 19:16:55 +0000 |
| commit | d0d326dddd84e7ce3416c243e04e5b764d1655db (patch) | |
| tree | 725feb9fe492a96db94a46addb0f24a419484c90 /coin/provisioning | |
| parent | 5745c4da94919c537e15d5f0edf09e3883416753 (diff) | |
Replace MinGW 5.3.0 with 7.3.0
Task-number: QTQAINFRA-1289
Task-number: QTQAINFRA-1389
Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/provisioning')
4 files changed, 17 insertions, 13 deletions
diff --git a/coin/provisioning/common/windows/open62541.ps1 b/coin/provisioning/common/windows/open62541.ps1 index 7e87cac4..beb09487 100644 --- a/coin/provisioning/common/windows/open62541.ps1 +++ b/coin/provisioning/common/windows/open62541.ps1 @@ -111,7 +111,7 @@ function MSVCEnvironment function BuildAndInstallOpen62541 { Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, msvc2015, msvc2017]")), + [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), [string]$Platform=$(throw("You must specify the target platform [x86, x64]")), [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]")) ) @@ -165,7 +165,7 @@ function BuildAndInstallOpen62541 function DownloadAndInstall { Param ( - [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, msvc2015, msvc2017]")), + [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")), [string]$Platform=$(throw("You must specify the target platform [x86, x64]")) ) $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/" @@ -233,6 +233,8 @@ if ($targetCommand.StartsWith("mingw")) { PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530 Write-Host "### Invoking MinGW630 build" PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630 + Write-Host "### Invoking MinGW730 build" + PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730 Write-Host "### Invoking MSVC2015 build" PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86 PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64 @@ -246,6 +248,8 @@ if ($targetCommand.StartsWith("mingw")) { DownloadAndInstall mingw530 x86 Write-Host "### MinGW630 x64" DownloadAndInstall mingw630 x86 + Write-Host "### MinGW730 x64" + DownloadAndInstall mingw730 x64 Write-Host "### MSVC2015 x86" DownloadAndInstall msvc2015 x86 Write-Host "### MSVC2015 x64" diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 deleted file mode 100644 index 684816f0..00000000 --- a/coin/provisioning/qtci-windows-7-x86/09-install-mingw530.ps1 +++ /dev/null @@ -1,10 +0,0 @@ -. "$PSScriptRoot\..\common\windows\install-mingw.ps1" - -# This script will install MinGW 5.3.0 - -$release = "i686-5.3.0-release-posix-dwarf-rt_v4-rev0" -$sha1 = "D4F21D25F3454F8EFDADA50E5AD799A0A9E07C6A" - -InstallMinGW $release $sha1 - - diff --git a/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 b/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 new file mode 100644 index 00000000..c893926e --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/09-install-mingw730.ps1 @@ -0,0 +1,10 @@ +. "$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" + +InstallMinGW $release $sha1 + + diff --git a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 b/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 index a7bc8cd4..85bfb98c 100644 --- a/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/79-open62541.ps1 @@ -1,2 +1,2 @@ . "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare -. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw530 +. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730 |