diff options
author | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-09-22 21:15:52 +0200 |
commit | 04ccf0e8dbdb9620ea2e850e5f1cc35a96cf95b6 (patch) | |
tree | ad43c2b5c1f89c763854f72dc14e72d18b97faac /coin/provisioning/common/install-strawberry-perl.ps1 | |
parent | 6c4eb77aa0f8b07bb48d74ede633c6bc56d1a75c (diff) | |
parent | e7472f43087921c3d83ff4452bbdb67ed27ed604 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9
42b502f is not needed for branches >= 5.8, configure.exe does not
exist anymore.
30660bf was not applied to 5.9 branch, the scripts were not
adapted to new template.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
Change-Id: Ie3681d5f641e99a074368f21b7f85fe31beacc17
Diffstat (limited to 'coin/provisioning/common/install-strawberry-perl.ps1')
-rw-r--r-- | coin/provisioning/common/install-strawberry-perl.ps1 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1 index 83b63897..bd5347b6 100644 --- a/coin/provisioning/common/install-strawberry-perl.ps1 +++ b/coin/provisioning/common/install-strawberry-perl.ps1 @@ -36,10 +36,17 @@ # This script installs Strawberry Perl $version = "5.26.0.1" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi" -$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi" +if( (is64bitWinHost) -eq 1 ) { + $arch = "-64bit" + $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" +} +else { + $arch = "-32bit" + $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi" +$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi" $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi" -$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D" Download $url_official $url_cache $strawberryPackage Verify-Checksum $strawberryPackage $sha1 |