Merge remote-tracking branch 'origin/5.6' into 5.9

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

.gitmodules

@@ -93,7 +93,7 @@
 	priority = 50
 [submodule "qtlocation"]
 	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport
+	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
 	branch = 5.9
@@ -237,7 +237,7 @@
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation
+	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
 	branch = 5.9

coin/README

@@ -3,6 +3,11 @@ Continuous Integration
 
 This directory contains files used by Qt's Continuous Integration system (Coin).
 
+pre-provisioning
+----------------
+Contains scripts which are used to install software to tier1 machines manually.
+E.g. Visual studio installation takes too long to be included to automatic provisioning of tier2 templates.
+
 provisioning
 ------------
 Contains scripts that apply to different test machines in order to run automatic tests on them.

coin/platform_configs/default.txt

@@ -1,14 +1,14 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8-x86_64                                               MSVC2013    DeveloperBuild Release BuildExamples
-qtci-windows-10-x86_64                                              MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8-x86                                                  MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-8-x86_64                                               MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-7-x86                                                  Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86                                                 MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64                                              MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic
-qtci-windows-10-x86_64              WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests
-qtci-windows-10-x86_64              WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-8-x86_64-2                                             MSVC2013    DeveloperBuild Release BuildExamples
+qtci-windows-10-x86_64-3                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-8-x86-2                                                MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-8-x86_64-2                                             MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-7-x86-2                                                Mingw53     Packaging DebugAndRelease Release OpenGLDynamic
+qtci-windows-10-x86-3                                               MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-3                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-3            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-3            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64                                      GCC         NoWidgets ForceDebugInfo DisableTests
 qtci-linux-Ubuntu-16.04-x86_64                                      GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace DisableTests
 qtci-linux-Ubuntu-14.04-x86_64                                      GCC         NoWidgets ForceDebugInfo
@@ -23,6 +23,6 @@ qtci-osx-10.10-x86_64                                               Clang
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework
 qtci-osx-10.10-x86_64               IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.2-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64      Boot2Qt_Jethro      armv7       GCC         DisableTests
+qtci-linux-Ubuntu-16.04-x86_64      Boot2Qt_Jethro      x86_64      GCC         DisableTests
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-Ubuntu-14.04-x86_64                                      GCC         TestOnly LicenseCheck

coin/platform_configs/qt5.txt

@@ -1,12 +1,14 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64      WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
+qtci-windows-10-x86_64-3    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests
 qtci-linux-RHEL-7.2-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86          Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86          Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-2        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-2        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-osx-10.10-x86_64       Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
 qtci-osx-10.10-x86_64       Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2
+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          QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-7-x86          QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-2        QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-2        QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-osx-10.10-x86_64       IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static

coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1

@@ -0,0 +1,58 @@
+#############################################################################
+##
+## 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

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")

coin/provisioning/common/03-conan.ps1

@@ -2,7 +2,7 @@
 
 $scriptsPath = "C:\Python27\Scripts"
 
-& "$scriptsPath\pip.exe" install --upgrade conan==0.16.0
+& "$scriptsPath\pip.exe" install --upgrade conan==0.20.2
 
 [Environment]::SetEnvironmentVariable("CI_CONAN_BUILDINFO_DIR", "C:\Utils\conanbuildinfos", "Machine")
 

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)) {

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

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

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh

@@ -38,7 +38,7 @@
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
-NTS_IP=10.212.2.0
+NTS_IP=10.212.2.216
 
 ExceptionGsettings1=100
 ExceptionGsettings2=101

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh

@@ -60,7 +60,7 @@ try
     # Enable linking to system dbus
     sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libdbus-1-dev || throw $ExceptionAPT
     # Needed libraries for WebEngine
-    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev || throw $ExceptionAPT
+    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT
     # Common event loop handling
     sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libglib2.0-dev || throw $ExceptionAPT
     # MySQL support
@@ -80,6 +80,8 @@ try
     # Install libraries needed for QtMultimedia to be able to support all plugins
     sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT
     sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
+    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
+    sudo DEBIAN_FRONTEND=noninteractive apt -q -y install g++-multilib || throw $ExceptionAPT
 )
 catch || {
     case $ex_code in

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh

@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+set -e
+# build latest qemu to usermode
+sudo apt-get -y install automake autoconf libtool
+
+tempDir=$(mktemp -d) || echo "Failed to create temporary directory"
+git clone git://git.qemu.org/qemu.git "$tempDir"
+cd "$tempDir"
+
+#latest commit from the master proven to work
+git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f
+git submodule update --init pixman
+./configure --target-list=arm-linux-user --static
+make
+sudo make install
+rm -rf "$tempDir"
+
+# Enable binfmt support
+sudo apt-get -y install binfmt-support
+
+# Install qemu binfmt
+sudo update-binfmts --package qemu-arm --install arm \
+/usr/local/bin/qemu-arm \
+--magic \
+"\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \
+--mask \
+"\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff"

coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh

@@ -39,7 +39,7 @@
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
 VNCPassword=qt
-NTS_IP=10.212.2.0
+NTS_IP=10.212.2.216
 
 ExceptionDisableScreensaver=100
 ExceptionSetInitialDelay=101

coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh

@@ -50,6 +50,7 @@ ExceptionSHA1=101
 ExceptionUnXZ=102
 ExceptionCPIO=103
 ExceptionDelete=104
+ExceptionAcceptLicense=105
 
 
 url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz
@@ -73,6 +74,9 @@ try
     echo "Deleting '${targetFile%.*}'"
     rm "${targetFile%.*}" || throw $ExceptionDelete
 
+    echo "Accept license"
+    sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
+
     echo "XCode = 8.2.1" >> ~/versions.txt
 )
 catch || {
@@ -97,6 +101,10 @@ catch || {
             echo "Failed to delete temporary file."
             exit 1;
         ;;
+        $ExceptionAcceptLicense)
+            echo "Failed to accept license."
+            exit 1;
+        ;;
 
     esac
 }

coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh

@@ -1,111 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# This script installs Command Line Tools for Xcode
-# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache
-
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-ExceptionDownloadUrl=100
-ExceptionSHA1=101
-ExceptionAttachImage=102
-ExceptionInstall=103
-ExceptionDetachImage=104
-ExceptionRemoveTmpFile=105
-ExceptionAcceptLicense=106
-
-
-url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg
-targetFile=/tmp/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg
-expectedSha1=0a55c5682c18879cfff7761619adb769ea396a79
-
-try
-(
-    echo "Downloading Command Line Tools from URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
-
-    echo "Checking SHA1 on '$targetFile'"
-    echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-
-    echo Mounting DMG
-    hdiutil attach "$targetFile" || throw $ExceptionAttachImage
-
-    echo Installing Command Line Tools
-    (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS Sierra version 10.12).pkg" -target /) || throw $ExceptionInstall
-
-    hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage
-
-    echo "Removing temporary file '$targetFile'"
-    rm "$targetFile" || throw $ExceptionRemoveTmpFile
-
-    echo "Accept license"
-    sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
-
-    echo "Command Line Tools = 8.2" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownloadUrl)
-            echo "Failed to download Command Line Tools from form URL '$url'."
-            exit 1;
-        ;;
-        $ExceptionSHA1)
-            echo "Failed to check SHA1."
-            exit 1;
-        ;;
-        $ExceptionAttachImage)
-            echo "Failed to attach image."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to install Command Line Tools."
-            exit 1;
-        ;;
-        $ExceptionDetachImage)
-            echo "Failed to detach image."
-            exit 1;
-        ;;
-        $ExceptionRemoveTmpFile)
-            echo "Failed to remove temporary file."
-            exit 1;
-        ;;
-        $ExceptionAcceptLicense)
-            echo "Failed to accept license."
-            exit 1;
-        ;;
-
-    esac
-}

coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh

@@ -39,7 +39,7 @@
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
 VNCPassword=qt
-NTS_IP=10.212.2.0
+NTS_IP=10.212.2.216
 
 ExceptionDisableScreensaver=100
 ExceptionSetInitialDelay=101

coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh

@@ -52,6 +52,7 @@ ExceptionSHA1=101
 ExceptionUnXZ=102
 ExceptionCPIO=103
 ExceptionDelete=104
+ExceptionAcceptLicense=105
 
 
 url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz
@@ -75,6 +76,9 @@ try
     echo "Deleting '${targetFile%.*}'"
     rm "${targetFile%.*}" || throw $ExceptionDelete
 
+    echo "Accept license"
+    sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
+
     echo "Xcode = 8.2" >> ~/versions.txt
 )
 catch || {
@@ -99,6 +103,10 @@ catch || {
             echo "Failed to delete temporary file."
             exit 1;
         ;;
+        $ExceptionAcceptLicense)
+            echo "Failed to accept license."
+            exit 1;
+        ;;
 
     esac
 }

coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh

@@ -1,111 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# This script installs Command Line Tools for Xcode
-# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache
-
-# shellcheck source=../common/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/try_catch.sh"
-
-ExceptionDownloadUrl=100
-ExceptionSHA1=101
-ExceptionAttachImage=102
-ExceptionInstall=103
-ExceptionDetachImage=104
-ExceptionRemoveTmpFile=105
-ExceptionAcceptLicense=106
-
-
-url=http://ci-files01-hki.ci.local/input/mac/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg
-targetFile=/tmp/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg
-expectedSha1=4df615ca765ac1a1e681ddcbca79fc15990e3b25
-
-try
-(
-    echo "Downloading Command Line Tools from URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
-
-    echo "Checking SHA1 on '$targetFile'"
-    echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-
-    echo Mounting DMG
-    hdiutil attach "$targetFile" || throw $ExceptionAttachImage
-
-    echo Installing Command Line Tools
-    (cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS El Capitan version 10.11).pkg" -target /) || throw $ExceptionInstall
-
-    hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage
-
-    echo "Removing temporary file '$targetFile'"
-    rm "$targetFile" || throw $ExceptionRemoveTmpFile
-
-    echo "Accept license"
-    sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
-
-    echo "Command Line Tools = 8.2" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownloadUrl)
-            echo "Failed to download Command Line Tools from form URL '$url'."
-            exit 1;
-        ;;
-        $ExceptionSHA1)
-            echo "Failed to check SHA1."
-            exit 1;
-        ;;
-        $ExceptionAttachImage)
-            echo "Failed to attach image."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to install Command Line Tools."
-            exit 1;
-        ;;
-        $ExceptionDetachImage)
-            echo "Failed to detach image."
-            exit 1;
-        ;;
-        $ExceptionRemoveTmpFile)
-            echo "Failed to remove temporary file."
-            exit 1;
-        ;;
-        $ExceptionAcceptLicense)
-            echo "Failed to accept license."
-            exit 1;
-        ;;
-
-    esac
-}

coin/provisioning/qtci-windows-10-x86/02-python.ps1

@@ -1 +1 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
+. "$PSScriptRoot\..\common\python.ps1" 32

coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1

@@ -0,0 +1,50 @@
+#############################################################################
+##
+## 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
+# 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

coin/provisioning/qtci-windows-10-x86_64/02-python.ps1

@@ -1 +1 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
+. "$PSScriptRoot\..\common\python.ps1" 64

coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1

@@ -0,0 +1,50 @@
+#############################################################################
+##
+## 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
+# 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

coin/provisioning/qtci-windows-10-x86_64/mysql.ps1

@@ -0,0 +1,112 @@
+#############################################################################
+##
+## 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"
+
+# This script installs MySQL $version.
+# 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"
+$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
+}
+
+# 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"
+
+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
+
+echo "Set environment variables ..."
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x64", "$installFolder\my_sql\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x64", "$installFolder\my_sql\lib", "Machine")
+
+# 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"
+
+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
+
+echo "Set environment variables ..."
+[Environment]::SetEnvironmentVariable("MYSQL_INCLUDE_x86", "$installFolder\my_sql\include", "Machine")
+[Environment]::SetEnvironmentVariable("MYSQL_LIB_x86", "$installFolder\my_sql\lib", "Machine")
+
+# Store version information to ~/versions.txt, which is used to print version information to provision log.
+echo "MySQL = $version" >> ~/versions.txt

coin/provisioning/qtci-windows-10-x86_64/opengl32_x86.ps1

@@ -0,0 +1,63 @@
+#############################################################################
+##
+## 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"
+
+$version = "11_2_2"
+$package = "C:\Windows\temp\opengl32sw_$version.7z"
+$destinationFolder = "C:\Windows\SysWOW64"
+$openglPackage = "C:\Windows\SysWOW64\opengl32.dll"
+
+$mesaOpenglUrl = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z"
+$mesaOpenglSha1 = "e742e9d4e16b9c69b6d844940861d3ef1748356b"
+$openglUrl = "http://ci-files01-hki.ci.local/input/mesa3d/windows/32bit/opengl32.dll"
+$openglSha1 = "690730f973aa39bd80648e026248394fde07a753"
+
+Invoke-WebRequest -UseBasicParsing $mesaOpenglUrl -OutFile $package
+Verify-Checksum $package $mesaOpenglSha1
+Get-ChildItem $package | % {& "C:\Utils\sevenzip\7z.exe" "x" "-y" $_.fullname "-o$destinationFolder"}
+
+echo "Remove downloaded $package ..."
+Remove-Item $package -recurse
+
+echo "Take ownership of existing opengl32.dll from SysWOW64"
+takeown /f $openglPackage
+icacls $openglPackage /grant Administrators:F
+echo "Remove existing opengl32.dll from SysWOW64"
+Remove-Item -Recurse -Force $openglPackage
+echo "Add new opengl32.dll to SysWOW64"
+Invoke-WebRequest -UseBasicParsing $openglUrl -OutFile $openglPackage
+Verify-Checksum $openglPackage $openglSha1
+
+# Store version information to ~/versions.txt
+echo "OpenGL x86 = $version" >> ~/versions.txt

coin/provisioning/qtci-windows-10-x86_64/openssl.ps1

@@ -0,0 +1,86 @@
+#############################################################################
+##
+## 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"
+
+# This script installs OpenSSL $version.
+# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
+
+$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 = "http://ci-files01-hki.ci.local/input/openssl/Win64OpenSSL-$version.exe"
+$sha1 = "b1660dbdcc77e1b3d81d780c7167be1c75384d44"
+
+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 "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"
+$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
+$internalUrl = "http://ci-files01-hki.ci.local/input/openssl/Win32OpenSSL-$version.exe"
+$sha1 = "29b31d20545214ab4e4c57afb20be2338c317cc3"
+
+echo "Fetching from URL ..."
+Download $externalUrl $internalUrl $packagex86
+Verify-Checksum $packagex86 $sha1
+echo "Installing $packagex86 ..."
+cmd /c "$packagex86 /SP- /SILENT /LOG /SUPPRESSMSGBOXES /NORESTART /DIR=$installFolder"
+
+echo "Remove downloaded $packagex86 ..."
+Remove-Item $packagex86
+
+echo "Set $architecture environment variables ..."
+[Environment]::SetEnvironmentVariable("OPENSSL_CONF_x86", "$installFolder\bin\openssl.cfg", "Machine")
+[Environment]::SetEnvironmentVariable("OPENSSL_INCLUDE_x86", "$installFolder\include", "Machine")
+[Environment]::SetEnvironmentVariable("OPENSSL_LIB_x86", "$installFolder\lib", "Machine")
+
+# Store version information to ~/versions.txt, which is used to print version information to provision log.
+echo "OpenSSL = $version" >> ~/versions.txt

coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1

@@ -0,0 +1,84 @@
+#############################################################################
+##
+## 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"
+
+# This script installs postgresql $version.
+# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
+
+$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"
+$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"
+$sha1 = "4da0453cdfda335e064d4437cf5bb9d356054cfd"
+
+echo "Fetching from URL ..."
+Download $externalUrl $internalUrl $packagex64
+Verify-Checksum $packagex64 $sha1
+echo "Installing $packagex64 ..."
+Extract-Zip $packagex64 $installFolder
+
+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")
+
+# Install x86 bit version
+$architecture = "x86"
+$installFolder = "C:\Utils\postgresql$architecture"
+$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"
+$sha1 = "eb4f01845e1592800edbb74f60944b6c0aca51a9"
+
+echo "Fetching from URL..."
+Download $externalUrl $internalUrl $packagex86
+Verify-Checksum $packagex86 $sha1
+echo "Installing $packagex86 ..."
+Extract-Zip $packagex86 $installFolder
+
+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")
+
+# Store version information to ~/versions.txt, which is used to print version information to provision log.
+echo "PostgreSQL = $version" >> ~/versions.txt

coin/provisioning/qtci-windows-7-x86/02-python.ps1

@@ -1 +1 @@
-. "$PSScriptRoot\..\common\02-python.ps1"
+. "$PSScriptRoot\..\common\python.ps1" 32

coin/provisioning/qtci-windows-8-x86/02-python.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\02-python.ps1"

coin/provisioning/qtci-windows-8-x86/06-python.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 32

coin/provisioning/qtci-windows-8-x86/cmake.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\cmake.ps1"

coin/provisioning/qtci-windows-8-x86_64/02-python.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\02-python.ps1"

coin/provisioning/qtci-windows-8-x86_64/06-python.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\python.ps1" 64

coin/provisioning/qtci-windows-8-x86_64/cmake.ps1

@@ -0,0 +1 @@
+. "$PSScriptRoot\..\common\cmake.ps1"

configure

@@ -33,7 +33,7 @@
 #############################################################################
 
 srcpath=`dirname $0`
-srcpath=`(cd "$srcpath"; /bin/pwd)`
+srcpath=`(cd "$srcpath"; pwd)`
 configure=$srcpath/qtbase/configure
 if [ ! -e "$configure" ]; then
     echo "$configure not found. Did you forget to run \"init-repository\"?" >&2

init-repository

@@ -144,7 +144,7 @@ Options:
 
         For example:
 
-          --mirror user\@machine:/foo/bar/
+          --mirror user\@machine:/foo/bar/qt/
 
         ...will use the following as a mirror for qtbase:
 
@@ -167,13 +167,13 @@ my $script_path = abs_path($0);
 $script_path =~ s,[/\\][^/\\]+$,,;
 
 my $GERRIT_SSH_BASE
-    = 'ssh://@USER@codereview.qt-project.org@PORT@/';
+    = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/';
 
 my $BER_MIRROR_URL_BASE
-    = 'git://hegel/';
+    = 'git://hegel/qt/';
 
 my $OSLO_MIRROR_URL_BASE
-    = 'git://qilin/';
+    = 'git://qilin/qt/';
 
 sub new
 {
@@ -381,7 +381,7 @@ sub git_clone_all_submodules
     # manually clone each repo here, so we can easily use reference repos, mirrors etc
     my @configresult = qx(git config -l);
     foreach my $line (@configresult) {
-        # Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git
+        # Example line: submodule.qtqa.url=git://code.qt.io/qt/qtqa.git
         next if ($line !~ /submodule\.([^.=]+)\.url=/);
         my $module = $1;
 
@@ -638,12 +638,12 @@ sub run
     chomp(my $url = `git config remote.origin.url`);
     die("Have no origin remote.\n") if (!$url);
     $url =~ s,\.git$,,;
-    $url =~ s,qt/qt5$,,;
+    $url =~ s/qt5$//;
     $self->{'base-url'} = $url;
 
-    $self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}});
+    $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}});
 
-    $self->git_add_remotes('qt/qt5');
+    $self->git_add_remotes('qt5');
 
     $self->git_install_hooks;