diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-02-04 15:30:50 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-02-04 15:30:50 +0100 |
| commit | 0e4931a8afa3e0a96df4a01b056ec82a274b7e45 (patch) | |
| tree | 901b8a075331c702abec0e27c50fdd17bb3d6b54 /coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 | |
| parent | 61cd31a5e37348945d81024fd2c4936c6c1f9e92 (diff) | |
| parent | 4cd14f462539e4873e86c2122bb8422f5f62fc29 (diff) | |
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 index 6fea9693..155df6b8 100644 --- a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 @@ -1,19 +1 @@ -. "$PSScriptRoot\..\common\windows\helpers.ps1" - -# This script installs DirectX SDK - -$package = "DXSDK_Jun10.exe" - -$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package" -$officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package" -$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69" -$exe = "C:\Windows\Temp\$package" - -Download $officialUrl $cachedUrl $exe - -echo "Installing DirectX SDK" -cmd /c "$exe /u" - -Remove-Item $exe - -echo "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt +. "$PSScriptRoot\..\common\windows\dxsdk.ps1" |