From 3ca76587815797b1b101941537c090b9026bd418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= <tony.sarajarvi@qt.io>
Date: Mon, 21 Aug 2017 15:14:00 +0300
Subject: Provision vanilla Windows 8.1 x86 and use it

Replaces existing Windows 8 x86 builds with
a vanilla tier 1 image that gets all needed
software provisioned except for VS2013 that is
pre-installed.
Also modifies existing provisioning scripts
under common to support this 32bit OS.

Task-number: QTQAINFRA-1383
Change-Id: I495cb2d78b4d2d8b2abb9af1254fff0a78a570d9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 coin/platform_configs/default.txt                  |  2 +-
 coin/provisioning/common/helpers.ps1               | 10 +++++
 .../common/install-dependencywalker.ps1            | 13 ++++--
 coin/provisioning/common/install-git.ps1           | 15 +++++--
 coin/provisioning/common/install-java.ps1          | 16 +++++--
 coin/provisioning/common/install-notepad++.ps1     | 21 +++++++--
 coin/provisioning/common/install-ruby.ps1          | 13 ++++--
 coin/provisioning/common/install-sevenzip.ps1      | 15 +++++--
 .../common/install-strawberry-perl.ps1             | 13 ++++--
 coin/provisioning/common/mysql.ps1                 | 25 +++++++----
 coin/provisioning/common/openssl.ps1               | 45 +++++++++++--------
 coin/provisioning/common/postgresql.ps1            | 50 ++++++++++++---------
 coin/provisioning/common/python.ps1                | 16 +++----
 .../01-windows_removethemall.ps1                   |  1 -
 .../qtci-windows-8-x86/04-disable-windefender.ps1  |  5 ---
 .../qtci-windows-8-x86/05-wsearch-off.ps1          |  3 --
 coin/provisioning/qtci-windows-8-x86/06-python.ps1 |  1 -
 .../qtci-windows-8-x86/07-mesa_llvmpipe.ps1        |  1 -
 coin/provisioning/qtci-windows-8-x86/cmake.ps1     |  1 -
 coin/provisioning/qtci-windows-8-x86/icu.ps1       |  1 -
 coin/provisioning/qtci-windows-8-x86/jom.ps1       |  1 -
 .../qtci-windows-8.1-x86/001-disable-uac.ps1       |  1 +
 .../004-disable-windows-updates.ps1                |  1 +
 .../009-set-network-test-server.ps1                |  1 +
 .../01-allow-remote-desktop-access.ps1             |  1 +
 .../qtci-windows-8.1-x86/02-disable-sleep.ps1      |  1 +
 .../qtci-windows-8.1-x86/02-install-notepad++.ps1  |  1 +
 .../qtci-windows-8.1-x86/03-install-sevenzip.ps1   |  1 +
 .../04-disable-windefender.ps1                     |  1 +
 .../qtci-windows-8.1-x86/05-wsearch-off.ps1        |  1 +
 .../qtci-windows-8.1-x86/06-python.ps1             |  1 +
 .../qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1      |  1 +
 .../qtci-windows-8.1-x86/08-install-git.ps1        |  1 +
 .../qtci-windows-8.1-x86/08-install-java.ps1       |  1 +
 .../09-install-dependencywalker.ps1                |  1 +
 .../qtci-windows-8.1-x86/09-install-ruby.ps1       |  1 +
 .../09-install-strawberry-perl.ps1                 |  1 +
 .../provisioning/qtci-windows-8.1-x86/09-mysql.ps1 |  1 +
 .../qtci-windows-8.1-x86/09-postgresql.ps1         |  1 +
 coin/provisioning/qtci-windows-8.1-x86/cmake.ps1   |  1 +
 coin/provisioning/qtci-windows-8.1-x86/icu.ps1     |  1 +
 coin/provisioning/qtci-windows-8.1-x86/jom.ps1     |  1 +
 .../qtci-windows-8.1-x86/msvc-2013-update5.ps1     | 51 ++++++++++++++++++++++
 coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 |  1 +
 44 files changed, 245 insertions(+), 96 deletions(-)
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/06-python.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/cmake.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/icu.ps1
 delete mode 100644 coin/provisioning/qtci-windows-8-x86/jom.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/icu.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/jom.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/openssl.ps1

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 23b6e331..ea6e259b 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -2,7 +2,7 @@ Template                            Target OS           Target arch Compiler
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release BuildExamples
 qtci-windows-8.1-x86_64                                             MSVC2012    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-8.1-x86                                                MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
 qtci-windows-8.1-x86_64                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
 qtci-windows-7-x86-2                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
 qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic
diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index 132fcdd3..3f7f0a68 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -88,3 +88,13 @@ function Add-Path
     echo "Adding $Path to Path"
     [Environment]::SetEnvironmentVariable("Path", $env:Path + ";$Path", [EnvironmentVariableTarget]::Machine)
 }
+
+function is64bitWinHost
+{
+    if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
+        return 1
+    }
+    else {
+        return 0
+    }
+}
diff --git a/coin/provisioning/common/install-dependencywalker.ps1 b/coin/provisioning/common/install-dependencywalker.ps1
index a9a56f7a..ad89fc7b 100644
--- a/coin/provisioning/common/install-dependencywalker.ps1
+++ b/coin/provisioning/common/install-dependencywalker.ps1
@@ -36,10 +36,17 @@
 # This script will install Dependency Walker 2.2.6000
 
 $version = "2.2.6000"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22_x64.zip"
-$url_official = "http://www.dependencywalker.com/depends22_x64.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "_x64"
+    $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
+}
+else {
+    $arch = "_x86"
+    $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\depends22" + $arch + ".zip"
+$url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip"
 $dependsPackage = "C:\Windows\Temp\depends-$version.zip"
-$sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA"
 
 $TARGETDIR = "C:\Utils\dependencywalker"
 if(!(Test-Path -Path $TARGETDIR )){
diff --git a/coin/provisioning/common/install-git.ps1 b/coin/provisioning/common/install-git.ps1
index d3543138..6b4a34b0 100644
--- a/coin/provisioning/common/install-git.ps1
+++ b/coin/provisioning/common/install-git.ps1
@@ -35,10 +35,17 @@
 # Install Git version 2.13.0
 
 $version = "2.13.0"
-$gitPackage = "C:\Windows\Temp\Git-" + $version + "-64-bit.exe"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + "-64-bit.exe"
-$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + "-64-bit.exe"
-$sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64-bit"
+    $sha1 = "E1D7C6E5E16ACAF3C108064A2ED158F604FA29A7"
+}
+else {
+    $arch = "-32-bit"
+    $sha1 = "03c7df2e4ef61ea6b6f9c0eb7e6d5151d9682aec"
+}
+$gitPackage = "C:\Windows\Temp\Git-" + $version + $arch + ".exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\Git-" + $version + $arch + ".exe"
+$url_official = "https://github.com/git-for-windows/git/releases/download/v" + $version + ".windows.1/Git-" + $version + $arch + ".exe"
 
 echo "Fetching Git $version..."
 Download $url_official $url_cache $gitPackage
diff --git a/coin/provisioning/common/install-java.ps1 b/coin/provisioning/common/install-java.ps1
index 06bcf6a1..4b9dd097 100644
--- a/coin/provisioning/common/install-java.ps1
+++ b/coin/provisioning/common/install-java.ps1
@@ -33,14 +33,24 @@
 
 . "$PSScriptRoot\..\common\helpers.ps1"
 
-# This script will install Java
+# This script will install Java RE
+# Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
 
 $version = "7u7"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-x64.exe"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "x64"
+    $sha1 = "9af03460c416931bdee18c2dcebff5db50cb8cb3"
+}
+else {
+    $arch = "i586"
+    $sha1 = "f76b1be20b144b1ee1d1de3255edb0a6b57d0219"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jre-" + $version + "-windows-" + $arch + ".exe"
 $javaPackage = "C:\Windows\Temp\java-$version.exe"
 
 Copy-Item $url_cache $javaPackage
 cmd /c "$javaPackage /s SPONSORS=0"
 echo "Cleaning $javaPackage.."
 Remove-Item -Recurse -Force "$javaPackage"
-echo "Java = $version" >> ~\versions.txt
+echo "Java = $version $arch" >> ~\versions.txt
diff --git a/coin/provisioning/common/install-notepad++.ps1 b/coin/provisioning/common/install-notepad++.ps1
index 15a8c004..2e893852 100644
--- a/coin/provisioning/common/install-notepad++.ps1
+++ b/coin/provisioning/common/install-notepad++.ps1
@@ -36,9 +36,16 @@
 # This script will install Notepad++
 
 $version = "7.3"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer.x64.exe"
-$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer.x64.exe"
-$sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = ".x64"
+    $sha1 = "E7306DF1D6E81801FB4BE0868610DB70E979B0AA"
+}
+else {
+    $arch = ""
+    $sha1 = "d4c403675a21cc381f640b92e596bae3ef958dc6"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\npp." + $version + ".Installer" + $arch + ".exe"
+$url_official = "https://notepad-plus-plus.org/repository/7.x/" + $version + "/npp." + $version + ".Installer" + $arch + ".exe"
 $nppPackage = "C:\Windows\Temp\npp-$version.exe"
 
 Download $url_official $url_cache $nppPackage
@@ -50,5 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage"
 
 echo "Notepad++ = $version" >> ~\versions.txt
 
-Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
+if( (is64bitWinHost) -eq 1 ) {
+    Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
+}
+else {
+    Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
+}
+
 echo "Auto-updating disabled."
diff --git a/coin/provisioning/common/install-ruby.ps1 b/coin/provisioning/common/install-ruby.ps1
index be0bc3eb..81b01342 100644
--- a/coin/provisioning/common/install-ruby.ps1
+++ b/coin/provisioning/common/install-ruby.ps1
@@ -36,10 +36,17 @@
 # This script will install Ruby
 
 $version = "2.2.6"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + "-x64.exe"
-$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + "-x64.exe"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
+}
+else {
+    $arch = ""
+    $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
 $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
-$sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
 
 Download $url_official $url_cache $rubyPackage
 Verify-Checksum $rubyPackage $sha1
diff --git a/coin/provisioning/common/install-sevenzip.ps1 b/coin/provisioning/common/install-sevenzip.ps1
index 91442500..1db41cc1 100644
--- a/coin/provisioning/common/install-sevenzip.ps1
+++ b/coin/provisioning/common/install-sevenzip.ps1
@@ -36,10 +36,19 @@
 # This script installs 7-Zip
 
 $version = "1604"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + "-x64.exe"
-$url_official = "http://www.7-zip.org/a/7z" + $version + "-x64.exe"
+
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-x64"
+    $sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
+}
+else {
+    $arch = ""
+    $sha1 = "dd1cb1163c5572951c9cd27f5a8dd550b33c58a4"
+}
+
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\7z" + $version + $arch + ".exe"
+$url_official = "http://www.7-zip.org/a/7z" + $version + $arch + ".exe"
 $7zPackage = "C:\Windows\Temp\7zip-$version.exe"
-$sha1 = "338A5CC5200E98EDD644FC21807FDBE59910C4D0"
 
 Download $url_official $url_cache $7zPackage
 Verify-Checksum $7zPackage $sha1
diff --git a/coin/provisioning/common/install-strawberry-perl.ps1 b/coin/provisioning/common/install-strawberry-perl.ps1
index 83b63897..bd5347b6 100644
--- a/coin/provisioning/common/install-strawberry-perl.ps1
+++ b/coin/provisioning/common/install-strawberry-perl.ps1
@@ -36,10 +36,17 @@
 # This script installs Strawberry Perl
 
 $version = "5.26.0.1"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + "-64bit.msi"
-$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" +$version+ "-64bit.msi"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = "-64bit"
+    $sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
+}
+else {
+    $arch = "-32bit"
+    $sha1 = "b50b688a879f33941433774b2813bfd4b917e4ee"
+}
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\strawberry-perl-" + $version + $arch + ".msi"
+$url_official = "http://strawberryperl.com/download/" + $version + "/strawberry-perl-" + $version + $arch + ".msi"
 $strawberryPackage = "C:\Windows\Temp\strawberry-installer-$version.msi"
-$sha1 = "2AE2EDA36A190701399130CBFEE04D00E9BA036D"
 
 Download $url_official $url_cache $strawberryPackage
 Verify-Checksum $strawberryPackage $sha1
diff --git a/coin/provisioning/common/mysql.ps1 b/coin/provisioning/common/mysql.ps1
index 9bd9929b..e300566e 100644
--- a/coin/provisioning/common/mysql.ps1
+++ b/coin/provisioning/common/mysql.ps1
@@ -62,21 +62,28 @@ try {
     Rename-Item -ErrorAction 'Stop' c:\utils\my_sql c:\utils\mysql_deleted
 } catch {}
 
-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\Utils\my_sql\my_sql"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    # Install x64 bit version
+    $architecture = "x64"
+    $installFolder = "C:\Utils\my_sql\my_sql"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-winx64.zip"
 
-DownloadAndInstall $internalUrl $packagex64 $installFolder
+    DownloadAndInstall $internalUrl $packagex64 $installFolder
 
-echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Set environment variables ..."
+    [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
+}
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\my_sql\my_sql$architecture"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\mysql-$version-win32.zip"
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\Utils\my_sql\my_sql$architecture"
+}
+else {
+    $installFolder = "C:\Utils\my_sql\my_sql"
+}
 
 DownloadAndInstall $internalUrl $packagex86 $installFolder
 
diff --git a/coin/provisioning/common/openssl.ps1 b/coin/provisioning/common/openssl.ps1
index 2d63106f..df320c72 100644
--- a/coin/provisioning/common/openssl.ps1
+++ b/coin/provisioning/common/openssl.ps1
@@ -40,30 +40,39 @@ $version = "1_0_2j"
 $packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
 $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 
-# Install x64 bit version
-$architecture = "x64"
-$installFolder = "C:\openssl"
-$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
-$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
+if( (is64bitWinHost) -eq 1 ) {
 
-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
+    # Install x64 bit version
+    $architecture = "x64"
+    $installFolder = "C:\openssl"
+    $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
+    $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
 
-echo "Remove downloaded $packagex64 ..."
-Remove-Item $packagex64
+    echo "Fetching from URL ..."
+    Download $externalUrl $internalUrl $packagex64
+    Verify-Checksum $packagex64 $sha1
+    echo "Installing $packagex64 ..."
+    cmd /c "$packagex64 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
 
-echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine")
-[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Remove downloaded $packagex64 ..."
+    Remove-Item $packagex64
+
+    echo "Set $architecture environment variables ..."
+    [Environment]::SetEnvironmentVariable("OPENSSL_CONF_x64", "$installFolder\bin\openssl.cfg", "Machine")
+    [Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("OPENSSL_LIB_x64", "$installFolder\lib", "Machine")
+}
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\openssl$architecture"
+
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\openssl$architecture"
+} else {
+    $installFolder = "C:\openssl"
+}
+
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
diff --git a/coin/provisioning/common/postgresql.ps1 b/coin/provisioning/common/postgresql.ps1
index 2ff97761..dd5858a3 100644
--- a/coin/provisioning/common/postgresql.ps1
+++ b/coin/provisioning/common/postgresql.ps1
@@ -40,37 +40,45 @@ $version = "9.1.9-1"
 $packagex64 = "C:\Windows\temp\postgresql-$version-windows-x64-binaries.zip"
 $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
 
-# Install x64 bit versions
-$architecture = "x64"
-$installFolder = "C:\Utils\postgresql\pgsql"
-$externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
-$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
+if( (is64bitWinHost) -eq 1 ) {
+    # Install x64 bit versions
+    $architecture = "x64"
+    $installFolder = "C:\Utils\postgresql\pgsql"
+    $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
+    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-x64-binaries.zip"
+    $sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
 
-# Delete any leftovers
-try {
-    Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
-} catch {}
+    # Delete any leftovers
+    try {
+        Rename-Item -ErrorAction 'Stop' c:\utils\postgresql c:\utils\postgresql-deleted
+    } catch {}
 
-echo "Fetching from URL ..."
-Download $externalUrl $internalUrl $packagex64
-Verify-Checksum $packagex64 $sha1
-echo "Installing $packagex64 ..."
-Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
+    echo "Fetching from URL ..."
+    Download $externalUrl $internalUrl $packagex64
+    Verify-Checksum $packagex64 $sha1
+    echo "Installing $packagex64 ..."
+    Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
 
-echo "Remove downloaded $packagex64 ..."
-Remove-Item $packagex64
+    echo "Remove downloaded $packagex64 ..."
+    Remove-Item $packagex64
 
-echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
+    echo "Set $architecture environment variables ..."
+    [Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
+    [Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
+}
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
 $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\postgresql-$version-windows-binaries.zip"
 $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
+if( (is64bitWinHost) -eq 1 ) {
+    $installFolder = "C:\Utils\postgresql$architecture\pgsql"
+}
+else {
+    $installFolder = "C:\Utils\postgresql\pgsql"
+}
+
 
 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1
index 29114456..0be96eef 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -30,27 +30,23 @@
 ## $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.13"
-$package = "C:\Windows\temp\python-$version.msi"
-
-# check bit version
-if ( $archVer -eq 64 ) {
-    echo "Running in 64 bit system"
-    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi"
-    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.amd64.msi"
+if( (is64bitWinHost) -eq 1 ) {
+    $arch = ".amd64"
     $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c"
 }
 else {
-    $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi"
-    $internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version.msi"
+    $arch = ""
     $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
+$package = "C:\Windows\temp\python-$version.msi"
+$externalUrl = "https://www.python.org/ftp/python/$version/python-$version" + $arch + ".msi"
+$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\python-$version" + $arch + ".msi"
 
 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $package
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
deleted file mode 100644
index dfca166f..00000000
--- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1
deleted file mode 100644
index 2d1f0783..00000000
--- a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1
+++ /dev/null
@@ -1,5 +0,0 @@
-# Turning off win defender.
-#
-# If disabled manually, windows will automatically enable it after
-# some period of time. Disabling it speeds up the builds.
-REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F
diff --git a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
deleted file mode 100644
index 09c45bbd..00000000
--- a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Disable the windows search indexing service
-sc.exe config WSearch start= disabled
diff --git a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1
deleted file mode 100644
index 27c618e1..00000000
--- a/coin/provisioning/qtci-windows-8-x86/06-python.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\python.ps1" 32
diff --git a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1
deleted file mode 100644
index b405191e..00000000
--- a/coin/provisioning/qtci-windows-8-x86/07-mesa_llvmpipe.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8-x86/cmake.ps1
deleted file mode 100644
index 8dbe0372..00000000
--- a/coin/provisioning/qtci-windows-8-x86/cmake.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1
deleted file mode 100644
index 325be36a..00000000
--- a/coin/provisioning/qtci-windows-8-x86/icu.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1
deleted file mode 100644
index 842c65dd..00000000
--- a/coin/provisioning/qtci-windows-8-x86/jom.ps1
+++ /dev/null
@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
new file mode 100644
index 00000000..2303699c
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-uac.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
new file mode 100644
index 00000000..c19bf6cd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windows-updates.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
new file mode 100644
index 00000000..16d2e180
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\set-network-test-server.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
new file mode 100644
index 00000000..e8e24995
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/01-allow-remote-desktop-access.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\allow-remote-desktop-access.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
new file mode 100644
index 00000000..ae3f327d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-disable-sleep.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-sleep.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
new file mode 100644
index 00000000..1f26c731
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-notepad++.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
new file mode 100644
index 00000000..ee3f36a9
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-sevenzip.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
new file mode 100644
index 00000000..f92acd91
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\disable-windefender.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
new file mode 100644
index 00000000..167cfd35
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/05-wsearch-off.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\wsearch-off.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
new file mode 100644
index 00000000..44c1c5ff
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 64
diff --git a/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
new file mode 100644
index 00000000..b405191e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/07-mesa_llvmpipe.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mesa_llvmpipe.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
new file mode 100644
index 00000000..f9129cff
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-git.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-git.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
new file mode 100644
index 00000000..07c4f487
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/08-install-java.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-java.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
new file mode 100644
index 00000000..8d549455
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-dependencywalker.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-dependencywalker.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
new file mode 100644
index 00000000..0d28ea1e
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-ruby.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-ruby.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
new file mode 100644
index 00000000..18109622
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-install-strawberry-perl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\install-strawberry-perl.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
new file mode 100644
index 00000000..a41035da
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-mysql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\mysql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
new file mode 100644
index 00000000..92339a45
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/09-postgresql.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\postgresql.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
new file mode 100644
index 00000000..8dbe0372
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\cmake.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
new file mode 100644
index 00000000..325be36a
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/icu.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\icu.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
new file mode 100644
index 00000000..842c65dd
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/jom.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\jom.ps1"
diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
new file mode 100644
index 00000000..8540c67d
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1
@@ -0,0 +1,51 @@
+#############################################################################
+##
+## 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\..\common\helpers.ps1"
+
+# Install Visual Studio 2013 update 5
+
+$version = "2013 Update 5 (KB2829760)"
+$package = "C:\Windows\Temp\vs12-kb2829760.exe"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VS2013.5.exe"
+
+echo "Fetching patch for Visual Studio $version..."
+Copy-Item $url_cache $package
+$commandLine = $package
+
+echo "Installing Update 5 for Visual Studio $version..."
+. $commandLine /norestart /passive
+
+echo "Removing $package ..."
+remove-item $package
+
+echo "Visual Studio = $version" >> ~\versions.txt
diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
new file mode 100644
index 00000000..f3906f78
--- /dev/null
+++ b/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1
@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\openssl.ps1"
-- 
cgit v1.2.3