diff options
| author | Joni Jantti <joni.jantti@qt.io> | 2018-02-22 10:22:12 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-23 21:00:15 +0000 |
| commit | b1a212b52ea909adc95078c0100f962762daef81 (patch) | |
| tree | c19a34a9c2ee897febfe2cfebfe411d6bcbeba46 /coin/provisioning/common/windows | |
| parent | 54d8396d681c97ace18e2710394b8b34fa8f0411 (diff) | |
Provisioning: Make Windows scripts use the Download helper function
Some Windows provisioning scripts use the Invoke-WebRequest without
setting the ProgressPreference = 'SilentlyContinue' variable for
disabling the download progress bar. Disabling the progress bar
greatly increases the download speed during provisioning.
Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows')
| -rw-r--r-- | coin/provisioning/common/windows/3dstudio_3rdparty.ps1 | 3 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/install-jdk.ps1 | 4 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/winrtrunner.ps1 | 3 |
3 files changed, 6 insertions, 4 deletions
diff --git a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 index f9c8faa7..b6804a77 100644 --- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" +$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty Remove-Item $zip diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index f6cf6a66..63e5edaf 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -55,7 +55,7 @@ echo "Fetching Java SE $version..." $ProgressPreference = 'SilentlyContinue' try { echo "...from local cache" - Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage + Download $url_cache $url_cache $javaPackage } catch { echo "...from oracle.com" $client = new-object System.Net.WebClient @@ -63,7 +63,7 @@ try { $client.Headers.Add("Cookie", $cookie) $client.DownloadFile($official_url, $javaPackage) - Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage + Download $official_url $official_url $javaPackage } Verify-Checksum $javaPackage $sha1 diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index f433ac7a..d53c12d6 100644 --- a/coin/provisioning/common/windows/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\winrtrunner.zip" +$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" Extract-Zip $zip C:\Utils\winrtrunner Remove-Item $zip |