diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-08 12:31:35 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-09 14:05:56 +0100 |
| commit | 90272a84aeeb02d5121a1b86dba607dfb57db45f (patch) | |
| tree | 0e6424005020faeb0712ef55e39691c19765a743 /coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 | |
| parent | f1a9b684bf72282204987b3ed33922e36d693884 (diff) | |
| parent | 207494b1d32ec331383d08e6f490cd0b4cfcb82e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Also update to pyro toolchain in QEMU way.
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
coin/platform_configs/qtdeclarative.txt
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh
Done-with: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Task-number: QTBUG-64384
Change-Id: If0451b81059e6831a5e5df0f359f119caf4ee09d
Diffstat (limited to 'coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1')
| -rw-r--r-- | coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 new file mode 100644 index 00000000..ba194de6 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/10-dxsdk.ps1 @@ -0,0 +1,19 @@ +. "$PSScriptRoot\..\common\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 |