diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-01 11:40:15 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-03 12:06:27 +0000 |
commit | 285ee106e7748a08ab1271b140cfe0429587e2a6 (patch) | |
tree | bac0ab40f6e38462eaf4337b724ba2f32cba89c4 /coin/provisioning/qtci-windows-10-x86_64 | |
parent | 95223c7466afb4791f630cd76c6574f13e7506b3 (diff) | |
parent | e00cb3ac596db7200108174cd85c66f4e3c1107a (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.9v5.9.0-beta1
Conflicts:
coin/platform_configs/default.txt
coin/platform_configs/qt5.txt
This also fixes the 7Z extraction code to work on the windows 7 x86
installation where 7z is not in the PATH anymore with revision 2. The
fallback code was 64-bit only and needs the null check for ProgramFiles(x86)
along with the fall back to ProgramFiles to locate the 7z executable.
Change-Id: Ifcf014c3a99685c427a62898e1fa83910a4a7247
Diffstat (limited to 'coin/provisioning/qtci-windows-10-x86_64')
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 | 2 | ||||
-rw-r--r-- | coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 (renamed from coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1) | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 index 0e401c02..44c1c5ff 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/02-python.ps1 @@ -1 +1 @@ -. "$PSScriptRoot\..\common\02-python.ps1" +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 index 83ff3f48..f16b5ef4 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 @@ -30,4 +30,21 @@ ## $QT_END_LICENSE$ ## ############################################################################# -. "$PSScriptRoot\..\common\msvc2015_update.ps1" +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx +# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe + +$version = "2015 update3 (KB3165756)" +$package = "C:\Windows\Temp\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" + +echo "Fetching patch for Visual Studio $version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing patch for Visual Studio $version..." +cmd /c "$package /norestart /Quiet" +remove-item $package |