diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 13:24:43 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 13:24:43 +0200 |
| commit | f56f2c20c4da182f6a979c418f7ba93d8d71694b (patch) | |
| tree | 8b79e348c7b158fece50d3cf9f9e893532fdf996 /coin/provisioning/qtci-windows-10-x86_64 | |
| parent | 8b9a8c489f8670a3be7cf30d2cfc224fb95c1144 (diff) | |
| parent | c9d5341307e02cc71d4d99342e6915621f7d18f3 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Conflicts:
coin/platform_configs/default.txt
This also reverts c9d5341307e02cc71d4d99342e6915621f7d18f3 as on macOS
10.11 in 5.9 we're using a fresh virtual machine template that doesn't
have stale virtualenv/python installations.
Change-Id: Iab50fde0388c97967ada7c40374345ce4327613a
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 | 1 | ||||
| -rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 | 11 |
2 files changed, 1 insertions, 11 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000..b405191e --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 index fa2c753a..bd9afd5a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1 @@ -34,22 +34,11 @@ . "$PSScriptRoot\..\common\helpers.ps1" $version = "11_2_2" -$package = "C:\Windows\temp\opengl32sw_$version.7z" -$destinationFolder = "C:\Windows\SysWOW64" $openglPackage = "C:\Windows\SysWOW64\opengl32.dll" -$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" -$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" $openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll" $openglSha1 = "690730f973aa39bd80648e026248394fde07a753" -Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package -Verify-Checksum $package $mesaOpenglSha1 -Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"} - -echo "Remove downloaded $package ..." -Remove-Item $package -recurse - echo "Take ownership of existing opengl32.dll from SysWOW64" takeown /f $openglPackage icacls $openglPackage /grant Administrators:F |