From c5c23f3eba93472e2d5296255541b4d6af9fd02c Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Sun, 28 May 2017 20:14:57 +0200
Subject: [PATCH 01/10] Update submodules on '5.6' in qt5

Change-Id: I0d0ee51f8952a7739b16f37ae526c14f44fb2ec7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 qtbase           | 2 +-
 qtdeclarative    | 2 +-
 qtqa             | 2 +-
 qtquickcontrols  | 2 +-
 qtquickcontrols2 | 2 +-
 qtrepotools      | 2 +-
 qtwebengine      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/qtbase b/qtbase
index 50d9ee2a..1131db8b 160000
--- a/qtbase
+++ b/qtbase
@@ -1 +1 @@
-Subproject commit 50d9ee2a4fd8d7b507370043a8deb97c108913ae
+Subproject commit 1131db8b4708dfa222b50fb4981a7becaf5ae4a3
diff --git a/qtdeclarative b/qtdeclarative
index 2da8e40f..caa273e3 160000
--- a/qtdeclarative
+++ b/qtdeclarative
@@ -1 +1 @@
-Subproject commit 2da8e40fe22396eec158c160ac75ab23d4a0abd8
+Subproject commit caa273e3bc6a2bece76c190b4135103eb7bbeab9
diff --git a/qtqa b/qtqa
index b8198f71..a6064652 160000
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit b8198f71d579f488d18e0bb7ef72c10f6a861ef6
+Subproject commit a606465231a4f8e94815e5a6657f608fd283290a
diff --git a/qtquickcontrols b/qtquickcontrols
index 5db735b1..a1149499 160000
--- a/qtquickcontrols
+++ b/qtquickcontrols
@@ -1 +1 @@
-Subproject commit 5db735b193f0520189a2b23a074a9fd62ca8f1f4
+Subproject commit a1149499650fe989016160941a715020aad42893
diff --git a/qtquickcontrols2 b/qtquickcontrols2
index 7f0db77f..be77d879 160000
--- a/qtquickcontrols2
+++ b/qtquickcontrols2
@@ -1 +1 @@
-Subproject commit 7f0db77f030dfa6d20987445df258a665223f641
+Subproject commit be77d8798a1df1cb928b944c145db3fa9aeb9777
diff --git a/qtrepotools b/qtrepotools
index 91471704..59e404b2 160000
--- a/qtrepotools
+++ b/qtrepotools
@@ -1 +1 @@
-Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3
+Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3
diff --git a/qtwebengine b/qtwebengine
index cc113790..e4ea5215 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit cc11379001a1a11e4d10709d5e83161d3260f98f
+Subproject commit e4ea5215ff40e5e179aeeeaa320e588a25c3ec13

From e78c03197a5c7c9313f3b55d9dece282337a9ee3 Mon Sep 17 00:00:00 2001
From: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Date: Sat, 3 Jun 2017 19:52:30 +0300
Subject: [PATCH 02/10] Update submodules on '5.6' in qt5

Change-Id: I436caf993701906de211398fe51ce4d2882ad5a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 qtqa            | 2 +-
 qtquickcontrols | 2 +-
 qtserialbus     | 2 +-
 qttools         | 2 +-
 qtwebengine     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qtqa b/qtqa
index a6064652..e8b0477c 160000
--- a/qtqa
+++ b/qtqa
@@ -1 +1 @@
-Subproject commit a606465231a4f8e94815e5a6657f608fd283290a
+Subproject commit e8b0477c14f74f9e3098d7ba6300ecbce912efef
diff --git a/qtquickcontrols b/qtquickcontrols
index a1149499..9fc3fcb5 160000
--- a/qtquickcontrols
+++ b/qtquickcontrols
@@ -1 +1 @@
-Subproject commit a1149499650fe989016160941a715020aad42893
+Subproject commit 9fc3fcb5a827196dee8c7afbd70a4c2361c65107
diff --git a/qtserialbus b/qtserialbus
index 0c60b2c1..f5b1c3a3 160000
--- a/qtserialbus
+++ b/qtserialbus
@@ -1 +1 @@
-Subproject commit 0c60b2c10bd30e1ccb775a3fb406ba1e8214b1c3
+Subproject commit f5b1c3a32b2a7c9bc06b68c469981ae46fb7172e
diff --git a/qttools b/qttools
index a4f65612..705d06c2 160000
--- a/qttools
+++ b/qttools
@@ -1 +1 @@
-Subproject commit a4f656126803b6cfac8ac4b442ee975562145b73
+Subproject commit 705d06c2841ef5d9ebda954c112fc8f1e32ec2cb
diff --git a/qtwebengine b/qtwebengine
index e4ea5215..56f594b1 160000
--- a/qtwebengine
+++ b/qtwebengine
@@ -1 +1 @@
-Subproject commit e4ea5215ff40e5e179aeeeaa320e588a25c3ec13
+Subproject commit 56f594b1f1750c7bb9917d5e1122233401ff00a2

From 982659b081c73d7ed373dd2845d2a926057b0f83 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 8 May 2017 12:15:40 +0200
Subject: [PATCH 03/10] Improve mysql installation

* Instead of deleting the files from a previous installation, which will
  not actually release any disk space but just make the qcow2 file
  larger, let's just rename the directory the old files are in.
  That is a significantly faster operation.
* When extracting the zip archive, only extract what we need for Qt:
  Libraries, binaries and headers. We can skip the installation of
  several thousand documentation files for example, which takes a long
  time.
* Instead of downloading the zip archive via PowerShell's
  Invoke-WebRequest we can get the data much faster using CopyItem off
  the CIFS share. As a bonus this is also more robust against download
  failures.

Change-Id: I9128bd70e5f4a4ebcdbf046765e76b63bad033a5
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 .../qtci-windows-10-x86_64/mysql.ps1          | 76 ++++++++-----------
 1 file changed, 33 insertions(+), 43 deletions(-)

diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index 5e75f662..6f2c86a4 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -37,53 +37,51 @@
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
 $version = "5.6.11"
-$packagex64 = "C:\Windows\temp\mysql-$version-win64.zip"
+$packagex64 = "C:\Windows\temp\mysql-$version-winx64.zip"
 $packagex86 = "C:\Windows\temp\mysql-$version-win32.zip"
 
-function CheckAndRemovePreviousInstallation
-{
-    Param (
-        [string]$InstallFolder
-    )
-    echo "Check for previous installation..."
-    $FolderExists = Test-Path $ExistingInstallation
-    If ($FolderExists -eq $True) {
-        echo "Removing previous installation ($ExistingInstallation)"
-        Remove-Item $ExistingInstallation -recurse
-    }
-}
-
 function DownloadAndInstall
 {
     Param (
-        [string]$arch,
-        [string]$externalUrl,
         [string]$internalUrl,
         [string]$package,
-        [string]$sha1,
         [string]$installPath
     )
 
-   echo "Fetching from URL ..."
-   Download $externalUrl $internalUrl $package
-   Verify-Checksum $package $sha1
-   Extract-Zip $package $installPath
+    echo "Fetching from URL ..."
+    Copy-Item $internalUrl $package
+
+    $shell = new-object -com shell.application
+
+    echo "Extracting contents"
+    foreach ($subDir in "lib", "include", "bin") {
+        $zipDir = $shell.Namespace($package + "\" + [io.path]::GetFileNameWithoutExtension($package) + "\" + $subDir)
+        if ($zipDir) {
+            Write-Host "Extracting $subDir from zip archive"
+        } else {
+            Write-Host "$subDir is missing from zip archive - skipping"
+            continue
+        }
+        $destDir = $installPath + "\" + $subdir
+        New-Item $destDir -type directory
+        $destinationFolder = $shell.Namespace($destDir)
+        $destinationFolder.CopyHere($zipDir.Items(), 16)
+    }
+
+    Remove-Item $package
 }
 
+# Remove any leftovers
+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"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-winx64"
-$sha1 = "f4811512b5f3c8ad877ee4feba2062312a0acc38"
+$installFolder = "C:\Utils\my_sql\my_sql"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-winx64.zip"
 
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex64 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-winx64 -newName $installFolder\my_sql
-
-echo "Remove downloaded package ..."
-Remove-Item $packagex64
+DownloadAndInstall $internalUrl $packagex64 $installFolder
 
 echo "Set environment variables ..."
 [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
@@ -91,18 +89,10 @@ echo "Set environment variables ..."
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\my_sql$architecture"
-$existingInstallation = "$installFolder\my_sql"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/mysql-$version-win32"
-$sha1 = "e0aa62d5c5d6c6ec28906a831752d04336562679"
+$installFolder = "C:\Utils\my_sql\my_sql$architecture"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-win32.zip"
 
-echo "Check and remove previous installation ..."
-CheckAndRemovePreviousInstallation $existingInstallation
-DownloadAndInstall $architecture $internalUrl $internalUrl $packagex86 $sha1 $installFolder
-Rename-Item -path $installFolder\mysql-$version-win32 -newName $installFolder\my_sql
-
-echo "Remove downloaded package ..."
-Remove-Item $packagex86
+DownloadAndInstall $internalUrl $packagex86 $installFolder
 
 echo "Set environment variables ..."
 [Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")

From ce47238ed94f3a989c13fef93b037904589910cf Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 8 May 2017 14:28:56 +0200
Subject: [PATCH 04/10] Improve Postgresql installation on Windows

Similar to the mysql change (parent commit) it's faster to rename any
older artifacts and install only what we need. This also generalizes the
zip archive extraction code for "dev" packages.

Change-Id: I3ad1f23efaed80fab3e0778a3e8c46317138f1ad
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 coin/provisioning/common/helpers.ps1          | 32 ++++++++++++++++++-
 .../qtci-windows-10-x86_64/mysql.ps1          | 18 ++---------
 .../qtci-windows-10-x86_64/postgresql.ps1     | 17 ++++++----
 3 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1
index 0e684452..132fcdd3 100644
--- a/coin/provisioning/common/helpers.ps1
+++ b/coin/provisioning/common/helpers.ps1
@@ -30,6 +30,32 @@ function Extract-Zip
     $destinationFolder.CopyHere($zipfile.Items(), 16)
 }
 
+function Extract-Dev-Folders-From-Zip
+{
+    Param (
+        [string]$package,
+        [string]$zipDir,
+        [string]$installPath
+    )
+
+    $shell = new-object -com shell.application
+
+    echo "Extracting contents of $package"
+    foreach ($subDir in "lib", "include", "bin", "share") {
+        $zip = $shell.Namespace($package + "\" + $zipDir + "\" + $subDir)
+        if ($zip) {
+            Write-Host "Extracting $subDir from zip archive"
+        } else {
+            Write-Host "$subDir is missing from zip archive - skipping"
+            continue
+        }
+        $destDir = $installPath + "\" + $subdir
+        New-Item $destDir -type directory
+        $destinationFolder = $shell.Namespace($destDir)
+        $destinationFolder.CopyHere($zip.Items(), 16)
+    }
+}
+
 function BadParam
 {
     Param ([string]$Description)
@@ -44,7 +70,11 @@ function Download
         [string] $Destination = $(BadParam("a download target location"))
     )
     try {
-        Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+        if ($CachedUrl.StartsWith("http")) {
+            Invoke-WebRequest -UseBasicParsing $CachedUrl -OutFile $Destination
+        } else {
+            Copy-Item $CachedUrl $Destination
+        }
     } catch {
         Invoke-WebRequest -UseBasicParsing $OfficialUrl -OutFile $Destination
     }
diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index 6f2c86a4..ce1d2be0 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -51,22 +51,8 @@ function DownloadAndInstall
     echo "Fetching from URL ..."
     Copy-Item $internalUrl $package
 
-    $shell = new-object -com shell.application
-
-    echo "Extracting contents"
-    foreach ($subDir in "lib", "include", "bin") {
-        $zipDir = $shell.Namespace($package + "\" + [io.path]::GetFileNameWithoutExtension($package) + "\" + $subDir)
-        if ($zipDir) {
-            Write-Host "Extracting $subDir from zip archive"
-        } else {
-            Write-Host "$subDir is missing from zip archive - skipping"
-            continue
-        }
-        $destDir = $installPath + "\" + $subdir
-        New-Item $destDir -type directory
-        $destinationFolder = $shell.Namespace($destDir)
-        $destinationFolder.CopyHere($zipDir.Items(), 16)
-    }
+    $zipDir = [io.path]::GetFileNameWithoutExtension($package)
+    Extract-Dev-Folders-From-Zip $package $zipDir $installPath
 
     Remove-Item $package
 }
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index 9b1d5d4e..e2edadf0 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -42,16 +42,21 @@ $packagex86 = "C:\Windows\temp\postgresql-$version-windows-binaries.zip"
 
 # Install x64 bit versions
 $architecture = "x64"
-$installFolder = "C:\Utils\postgresql"
+$installFolder = "C:\Utils\postgresql\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-x64-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-x64-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\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 {}
+
 echo "Fetching from URL ..."
 Download $externalUrl $internalUrl $packagex64
 Verify-Checksum $packagex64 $sha1
 echo "Installing $packagex64 ..."
-Extract-Zip $packagex64 $installFolder
+Extract-Dev-Folders-From-Zip $packagex64 "pgsql" $installFolder
 
 echo "Remove downloaded $packagex64 ..."
 Remove-Item $packagex64
@@ -62,16 +67,16 @@ echo "Set $architecture environment variables ..."
 
 # Install x86 bit version
 $architecture = "x86"
-$installFolder = "C:\Utils\postgresql$architecture"
+$installFolder = "C:\Utils\postgresql$architecture\pgsql"
 $externalUrl = "http://get.enterprisedb.com/postgresql/postgresql-$version-windows-binaries.zip"
-$internalUrl = "http://ci-files01-hki.ci.local/input/windows/postgresql-$version-windows-binaries.zip"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\postgresql-$version-windows-binaries.zip"
 $sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
 
 echo "Fetching from URL..."
 Download $externalUrl $internalUrl $packagex86
 Verify-Checksum $packagex86 $sha1
 echo "Installing $packagex86 ..."
-Extract-Zip $packagex86 $installFolder
+Extract-Dev-Folders-From-Zip $packagex86 "pgsql" $installFolder
 
 echo "Remove downloaded $packagex86 ..."
 Remove-Item $packagex86

From 999b5f5dd7ab11edbb66342b8ecac68532b1486e Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 8 May 2017 16:09:17 +0200
Subject: [PATCH 05/10] Speed up Visual Studio update installation

We have a prepared package on the internal server that has everything
necessary included. This way we do not have to download the actual
update content from the internet.

Change-Id: Ie4cb3116a4f91a47df5be1c2b2e473d7ddec9a78
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
---
 .../common/msvc_2015_update3_patch.ps1        | 60 +++++++++++++++++++
 .../msvc_2015_update3_patch.ps1               | 18 +-----
 .../msvc_2015_update3_patch.ps1               | 18 +-----
 3 files changed, 62 insertions(+), 34 deletions(-)
 create mode 100644 coin/provisioning/common/msvc_2015_update3_patch.ps1

diff --git a/coin/provisioning/common/msvc_2015_update3_patch.ps1 b/coin/provisioning/common/msvc_2015_update3_patch.ps1
new file mode 100644
index 00000000..6a02f6bd
--- /dev/null
+++ b/coin/provisioning/common/msvc_2015_update3_patch.ps1
@@ -0,0 +1,60 @@
+#############################################################################
+##
+## 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 Cumulative Servicing Release Visual Studio 2015 update 3
+# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx
+
+$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"
+$preparedPackage="\\ci-files01-hki.ci.local\provisioning\windows\vs14-kb3165756-update"
+
+if (Test-Path $preparedPackage) {
+    echo "Using prepared package"
+    pushd $preparedPackage
+    $commandLine = "$preparedPackage\vs14-kb3165756.exe"
+} else {
+    echo "Fetching patch for Visual Studio $version..."
+    Download $url_official $url_cache $package
+    Verify-Checksum $package $sha1
+    $commandLine = $package
+}
+echo "Installing patch for Visual Studio $version..."
+. $commandLine /norestart /passive
+
+if ($commandLine.StartsWith("C:\Windows")) {
+    remove-item $package
+}
diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.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/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
index f16b5ef4..37af7119 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1
@@ -30,21 +30,5 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\common\helpers.ps1"
+. "$PSScriptRoot\..\common\msvc_2015_update3_patch.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

From 038d26308151b5e15394b9a63b274278a2456662 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Mon, 8 May 2017 17:09:23 +0200
Subject: [PATCH 06/10] Speed up Windows installation of cmake, python, opengl,
 mysys and Android
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We're better off copying off the internal server using CIFS than using
PowerShell's incredibly slow Invoke-WebRequest.

Change-Id: Ic39cf08be70335e9309575d543155bffaceb0db0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 coin/provisioning/common/cmake.ps1                          | 2 +-
 coin/provisioning/common/python.ps1                         | 4 ++--
 coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1   | 2 +-
 coin/provisioning/qtci-windows-10-x86_64/openssl.ps1        | 4 ++--
 coin/provisioning/qtci-windows-7-x86/04-msys.ps1            | 2 +-
 coin/provisioning/qtci-windows-7-x86/06-android.ps1         | 4 ++--
 coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1
index 6870f3a7..88e2a10c 100644
--- a/coin/provisioning/common/cmake.ps1
+++ b/coin/provisioning/common/cmake.ps1
@@ -2,7 +2,7 @@
 
 $zip = "c:\users\qt\downloads\cmake-3.6.2-win32-x86.zip"
 
-Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-win32-x86.zip $zip
+Download https://cmake.org/files/v3.6/cmake-3.6.2-win32-x86.zip \\ci-files01-hki.ci.local\provisioning\cmake\cmake-3.6.2-win32-x86.zip $zip
 Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E"
 
 Extract-Zip $zip C:
diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1
index 3edbc412..ef4be200 100644
--- a/coin/provisioning/common/python.ps1
+++ b/coin/provisioning/common/python.ps1
@@ -43,12 +43,12 @@ $package = "C:\Windows\temp\python-$version.msi"
 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"
+    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.amd64.msi"
     $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"
+    $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\python-$version.msi"
     $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0"
 }
 
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 079f26c3..fa2c753a 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1
@@ -40,7 +40,7 @@ $openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
 
 $mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
 $mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
-$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
+$openglUrl = "\\ci-files01-hki.ci.local\provisioning\mesa3d\windows\32bit\opengl32.dll"
 $openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
 
 Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
diff --git a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
index 35340ca7..cd0115d2 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/openssl.ps1
@@ -44,7 +44,7 @@ $packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
 $architecture = "x64"
 $installFolder = "C:\openssl"
 $externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win64OpenSSL-$version.exe"
 $sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
 
 echo "Fetching from URL ..."
@@ -65,7 +65,7 @@ echo "Set $architecture environment variables ..."
 $architecture = "x86"
 $installFolder = "C:\openssl$architecture"
 $externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
-$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
+$internalUrl = "\\ci-files01-hki.ci.local\provisioning\openssl\Win32OpenSSL-$version.exe"
 $sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
 
 echo "Fetching from URL ..."
diff --git a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1 b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
index b75fd2a6..fdb70ef8 100644
--- a/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/04-msys.ps1
@@ -3,7 +3,7 @@
 # This script will install msys which is needed for configuring openssl for Android
 
 $version = "1.0.11"
-$url = "http://ci-files01-hki.ci.local/input/windows/msys-$version.7z"
+$url = "\\ci-files01-hki.ci.local\provisioning\windows\msys-$version.7z"
 
 $zip = "c:\users\qt\downloads\msys-$version.7z"
 $sha1 = "22cd76f1263db8c72727a9537228c481ff33c285"
diff --git a/coin/provisioning/qtci-windows-7-x86/06-android.ps1 b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
index 96be39a3..aa4a4fa5 100644
--- a/coin/provisioning/qtci-windows-7-x86/06-android.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/06-android.ps1
@@ -8,7 +8,7 @@
 
 # NDK
 $ndkVersion = "r10e"
-$ndkCachedUrl = "http://ci-files01-hki.ci.local/input/android/android-ndk-$ndkVersion-windows-x86.zip"
+$ndkCachedUrl = "\\ci-files01-hki.ci.local\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip"
 $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip"
 $ndkChecksum = "1d0b8f2835be741f3048fb03c0a3e9f71ab7f357"
 $ndkFolder = "c:\utils\android-ndk-$ndkVersion"
@@ -19,7 +19,7 @@ $sdkVersion = "r24.4.1"
 $sdkApi = "ANDROID_API_VERSION"
 $sdkApiLevel = "android-18"
 $sdkBuildToolsVersion = "23.0.3"
-$sdkCachedUrl= "http://ci-files01-hki.ci.local/input/android/android-sdk_$sdkVersion-windows.zip"
+$sdkCachedUrl= "\\ci-files01-hki.ci.local\provisioning\android\android-sdk_$sdkVersion-windows.zip"
 $sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip"
 $sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49"
 $sdkFolder = "c:\utils\android-sdk-windows"
diff --git a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1 b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
index a1b656c6..14a5a085 100644
--- a/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/07-android_openssl.ps1
@@ -9,7 +9,7 @@ $zip = "c:\users\qt\downloads\openssl-$version.tar.gz"
 $sha1 = "bdfbdb416942f666865fa48fe13c2d0e588df54f"
 $destination = "C:\Utils\openssl-android-master"
 
-Download https://www.openssl.org/source/openssl-$version.tar.gz http://ci-files01-hki.ci.local/input/openssl/openssl-$version.tar.gz $zip
+Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.ci.local\provisioning\openssl\openssl-$version.tar.gz $zip
 Verify-Checksum $zip $sha1
 
 C:\Utils\sevenzip\7z.exe x $zip -oC:\Utils

From 35057fe4b2e4fd1c11a87cc19d4baf673df9e0ad Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 9 May 2017 09:46:31 +0200
Subject: [PATCH 07/10] Clean up windows cleanup script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* There's no need to have a numbered prefix in the common directory
* Instead of deleting directories trees worth several gigabytes of data,
  just rename the directory. The underlying storage system is
  copy-on-write and so deleting the files produces more data than just
  moving the directory out of the way. Deleting the files does not
  actually free up any physical disk space.

Change-Id: I6de02d56f3485651726ea11183ce7571d5b61520
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
---
 .../{01-windows_removethemall.ps1 => windows_removethemall.ps1} | 2 +-
 .../qtci-windows-10-x86/01-windows_removethemall.ps1            | 2 +-
 .../qtci-windows-10-x86_64/01-windows_removethemall.ps1         | 2 +-
 .../qtci-windows-7-x86/01-windows_removethemall.ps1             | 2 +-
 .../qtci-windows-8-x86/01-windows_removethemall.ps1             | 2 +-
 .../qtci-windows-8-x86_64/01-windows_removethemall.ps1          | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename coin/provisioning/common/{01-windows_removethemall.ps1 => windows_removethemall.ps1} (97%)

diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/windows_removethemall.ps1
similarity index 97%
rename from coin/provisioning/common/01-windows_removethemall.ps1
rename to coin/provisioning/common/windows_removethemall.ps1
index ebbf15dd..0e584900 100644
--- a/coin/provisioning/common/01-windows_removethemall.ps1
+++ b/coin/provisioning/common/windows_removethemall.ps1
@@ -56,6 +56,6 @@ Function Remove-Path {
 }
 
 # Remove Android sdk and ndk
-Remove C:\utils\android*
+dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
 [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
 [Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
diff --git a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-7-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"
diff --git a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1 b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
index 3bb0af0e..dfca166f 100644
--- a/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
+++ b/coin/provisioning/qtci-windows-8-x86_64/01-windows_removethemall.ps1
@@ -1 +1 @@
-. "$PSScriptRoot\..\common\01-windows_removethemall.ps1"
+. "$PSScriptRoot\..\common\windows_removethemall.ps1"

From 303d617329ee5b45aa1515404246aef37caee862 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Tue, 6 Jun 2017 14:16:47 +0200
Subject: [PATCH 08/10] Disable tests on macOS 10.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We cannot run graphical tests reliably on 10.10 anymore with the new
virtualization without vmware. As outlined in the referenced task, we
occasionally get the Window Server locking up. So for the time being,
this change disables testing on 10.10.

Task-number: QTQAINFRA-1198
Change-Id: I020d4a298562554838cd7e898df52438db536d7a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 coin/platform_configs/default.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 4ac819c4..2e11cc02 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -15,7 +15,7 @@ qtci-linux-Ubuntu-14.04-x86_64                                      GCC
 qtci-linux-OpenSuSE-13.01-x86_64                                    GCC         DeveloperBuild NoPch
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Packaging Release NoUseGoldLinker
 qtci-osx-10.11-x86_64                                               Clang       Packaging DebugAndRelease Release
-qtci-osx-10.10-x86_64                                               Clang       DebugAndRelease Release
+qtci-osx-10.10-x86_64                                               Clang       DebugAndRelease Release DisableTests
 qtci-osx-10.9-x86_64                                                Clang       DeveloperBuild Release QtNamespace NoPch
 qtci-osx-10.8-x86_64                                                Clang       Release NoFramework
 qtci-osx-10.11-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static

From 0358b6d28c6a9a23d4faf7d59a7a1f0f1e2732e1 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Fri, 26 May 2017 19:45:57 +0200
Subject: [PATCH 09/10] Remove QNX Windows builds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We can't get those to work with the faster KVM based VMs, so disable
these builds for the time being.

Task-number: QTQAINFRA-1208
Change-Id: I74c19374d57e3f84d8f982b95aade4a779623228
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
---
 coin/platform_configs/qt5.txt | 2 --
 1 file changed, 2 deletions(-)

diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 77668039..8751f38c 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -9,8 +9,6 @@ qtci-windows-7-x86-2        Android_ANY         x86         Mingw49     Packagin
 qtci-osx-10.11-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-osx-10.11-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
 qtci-linux-RHEL-6.6-x86_64  QNX_660             x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-2        QNX_660             armv7       Mingw49     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86-2        QNX_660             x86         Mingw49     Packaging Release DisableTests OpenGLES2
 # target arch is used here only for documentation the value is ignored
 qtci-windows-10-x86_64-7    WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
 

From 5bc43f0cc3cfe047dcdbe2a293f4ed6885d8a637 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@qt.io>
Date: Thu, 8 Jun 2017 13:34:20 +0200
Subject: [PATCH 10/10] Fix Postgresql and Mysql environment variables

The correct paths to the headers are

    c:\utils\postgresql[x86]\pgsql\include

not

    c:\utils\postgresql[x86]\pgsql\pgsql\include

Same for libs.

Regression introduced by commit ce47238ed94f3a989c13fef93b037904589910cf
but only noticed in the 5.9 branch.

Change-Id: Ib16072c0cc1c52f743f5500bc9732c8b04e962c7
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
---
 coin/provisioning/qtci-windows-10-x86_64/mysql.ps1      | 8 ++++----
 coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
index ce1d2be0..56b78f47 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1
@@ -70,8 +70,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi
 DownloadAndInstall $internalUrl $packagex64 $installFolder
 
 echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\lib", "Machine")
 
 # Install x86 bit version
 $architecture = "x86"
@@ -81,8 +81,8 @@ $internalUrl = "\\ci-files01-hki.ci.local\provisioning\windows\mysql-$version-wi
 DownloadAndInstall $internalUrl $packagex86 $installFolder
 
 echo "Set environment variables ..."
-[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
-[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\lib", "Machine")
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "MySQL = $version" >> ~/versions.txt
diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
index e2edadf0..b73c3778 100644
--- a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
+++ b/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1
@@ -62,8 +62,8 @@ echo "Remove downloaded $packagex64 ..."
 Remove-Item $packagex64
 
 echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x64", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x64", "$installFolder\lib", "Machine")
 
 # Install x86 bit version
 $architecture = "x86"
@@ -82,8 +82,8 @@ echo "Remove downloaded $packagex86 ..."
 Remove-Item $packagex86
 
 echo "Set $architecture environment variables ..."
-[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\pgsql\include", "Machine")
-[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\pgsql\lib", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("POSTGRESQL_LIB_x86", "$installFolder\lib", "Machine")
 
 # Store version information to ~/versions.txt, which is used to print version information to provision log.
 echo "PostgreSQL = $version" >> ~/versions.txt