diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
| commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
| tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/provisioning/common/install-dependencywalker.ps1 | |
| parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
| parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/provisioning/common/install-dependencywalker.ps1')
| -rw-r--r-- | coin/provisioning/common/install-dependencywalker.ps1 | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1 index a9a56f7a..ad89fc7b 100644 --- a/coin/provisioning/common/install-dependencywalker.ps1 +++ b/coin/provisioning/common/install-dependencywalker.ps1 @@ -36,10 +36,17 @@ # This script will install Dependency Walker 2.2.6000 $version = "2.2.6000" -$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip" -$url_official = "http://www.dependencywalker.com/depends22_x64.zip" +if( (is64bitWinHost) -eq 1 ) { + $arch = "_x64" + $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" +} +else { + $arch = "_x86" + $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" +} +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip" +$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip" $dependsPackage = "C:\Windows\Temp\depends-$version.zip" -$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" $TARGETDIR = "C:\Utils\dependencywalker" if(!(Test-Path -Path $TARGETDIR )){ |