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

14 files changed, 55 insertions, 80 deletions

diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1
index 9e64a34d..ebbf15dd 100644
--- a/coin/provisioning/common/01-windows_removethemall.ps1
+++ b/coin/provisioning/common/01-windows_removethemall.ps1
@@ -55,11 +55,6 @@ Function Remove-Path {
     [System.Environment]::SetEnvironmentVariable($name,$value,$type)
 }
 
-# Remove Python
-Remove C:\Python27
-Remove-Path C:\python27\scripts
-Remove-Path C:\python27
-
 # Remove Android sdk and ndk
 Remove C:\utils\android*
 [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index 191be290..af7f79ff 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -24,7 +24,7 @@ function Extract-7Zip
     echo "Extracting '$Source' to '$Destination'..."
 
     if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
-        $zipExe = join-path ${env:ProgramFiles(x86)} '7-zip\7z.exe'
+        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles} -ne $null)[0] '7-zip\7z.exe'
         if (-not (test-path $zipExe)) {
             $zipExe = join-path ${env:ProgramW6432} '7-zip\7z.exe'
             if (-not (test-path $zipExe)) {
diff --git a/coin/provisioning/common/msvc2015_update.ps1 b/coin/provisioning/common/msvc2015_update.ps1
deleted file mode 100644
index 618c87c4..00000000
--- a/coin/provisioning/common/msvc2015_update.ps1
+++ /dev/null
@@ -1,58 +0,0 @@
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-. "$PSScriptRoot\helpers.ps1"
-
-# Install Visual Studio $version with $update_version
-# Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs
-$version = "2015"
-$update_version = "3"
-
-# Only way to install specific Visual studio release is to use feed.xml.
-# Visual Studio $version setup will use the feed.xml that was available when $update_version released -> 'https://msdn.microsoft.com/en-us/library/mt653628.aspx'
-# These parameters will install Visual Studio Enterprise Update $update_version (the original Update $update_version without any further Update $update_version-era updates)
-$parameters = "/OverrideFeedURI http://download.microsoft.com/download/6/B/B/6BBD3561-D764-4F39-AB8E-05356A122545/20160628.2/enu/feed.xml"
-
-$msvc_web_installer = "vs" + $version + "_" + $update_version
-$package = "C:\Windows\temp\$msvc_web_installer.exe"
-$url_cache = "http://ci-files01-hki.ci.local/input/windows/$msvc_web_installer.exe"
-$url_official = "https://go.microsoft.com/fwlink/?LinkId=691129"
-$sha1 = "68abf90424aff604a04d6c61fb52adcd2cab2266"
-
-echo "Fetching Visual Studio $version update $update_version..."
-Download $url_official $url_cache $package
-Verify-Checksum $package $sha1
-echo "Installing Visual studio $version update $update_version..."
-cmd /c "$package $parameters /norestart /Quiet"
-remove-item $package
-
-echo "Visual Studio = $version update $update_version" >> ~\versions.txt
diff --git a/coin/provisioning/common/02-python.ps1 b/coin/provisioning/common/python.ps1
index 32972830..3edbc412 100644
--- a/coin/provisioning/common/02-python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -30,39 +30,40 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-
+param([Int32]$archVer=32)
 . "$PSScriptRoot\helpers.ps1"
 
 # This script installs Python $version.
 # Python is required for building Qt 5 from source.
 
-$version = "2.7.10"
+$version = "2.7.13"
 $package = "C:\Windows\temp\python-$version.msi"
 
 # check bit version
-if ([System.Environment]::Is64BitProcess -eq $TRUE) {
+if ( $archVer -eq 64 ) {
+    echo "Running in 64 bit system"
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
     $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi"
-    $sha1 = "f3a474f6ab191f9b43034c0fb5c98301553775d4"
+    $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
     $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
     $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi"
-    $sha1 = "9e62f37407e6964ee0374b32869b7b4ab050d12a"
+    $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
 
 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $package
 Verify-Checksum $package $sha1
 echo "Installing $package..."
-cmd /c "$package /q"
+cmd /c "msiexec /passive /i $package ALLUSERS=1"
 # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB
 echo "Chancing allowZip64 value to 'True'..."
 (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py
 echo "Remove $package..."
 del $package
-Add-Path $path
+[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine)
 
-& python -m ensurepip
+C:\Python27\python.exe -m ensurepip
 # Install python virtual env
-pip.exe install virtualenv
+C:\Python27\Scripts\pip.exe install virtualenv
diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
index 02ddda3f..42db3716 100644
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh
@@ -68,3 +68,6 @@ sudo cp -a $tempDir/lib/* /usr/lib64
 sudo cp -a $tempDir/* /usr/
 
 sudo /sbin/ldconfig
+
+# Storage version information to ~/versions.txt, which is used to print version information to provision log.
+echo "ICU = $icuVersion" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86/02-python.ps1 b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
index 0e401c02..27c618e1 100644
--- a/coin/provisioning/qtci-windows-10-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
+. "$PSScriptRoot\..\common\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
index 83ff3f48..f16b5ef4 100644
--- a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/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
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
diff --git a/coin/provisioning/qtci-windows-7-x86/02-python.ps1 b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
index 0e401c02..27c618e1 100644
--- a/coin/provisioning/qtci-windows-7-x86/02-python.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/02-python.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
+. "$PSScriptRoot\..\common\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8-x86/02-python.ps1 b/coin/provisioning/qtci-windows-8-x86/02-python.ps1
deleted file mode 100644
index 0e401c02..00000000
--- a/coin/provisioning/qtci-windows-8-x86/02-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1
new file mode 100644
index 00000000..27c618e1
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86/06-python.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-python.ps1
deleted file mode 100644
index 0e401c02..00000000
--- a/coin/provisioning/qtci-windows-8-x86_64/02-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1
new file mode 100644
index 00000000..44c1c5ff
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 64