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-sevenzip.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-sevenzip.ps1')
| -rw-r--r-- | coin/provisioning/common/install-sevenzip.ps1 | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1 index 91442500..1db41cc1 100644 --- a/coin/provisioning/common/install-sevenzip.ps1 +++ b/coin/provisioning/common/install-sevenzip.ps1 @@ -36,10 +36,19 @@ # This script installs 7-Zip $version = "1604" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe" -$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe" + +if( (is64bitWinHost) -eq 1 ) { + $arch = "-x64" + $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" +} +else { + $arch = "" + $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4" +} + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe" +$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe" $7zPackage = "C:\Windows\Temp\7zip-$version.exe" -$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0" Download $url_official $url_cache $7zPackage Verify-Checksum $7zPackage $sha1 |