Set the list of submodules to those needed for Qbs

Change-Id: I8b4dc36d4b0a3af7eb393a4c7fd28b7db29989f2

.gitmodules

@@ -3,269 +3,9 @@
 	url = ../qtbase.git
 	branch = 5.6
 	status = essential
-[submodule "qtsvg"]
-	depends = qtbase
-	path = qtsvg
-	url = ../qtsvg.git
-	branch = 5.6
-	status = addon
-[submodule "qtdeclarative"]
-	depends = qtbase
-	recommends = qtsvg qtxmlpatterns
-	path = qtdeclarative
-	url = ../qtdeclarative.git
-	branch = 5.6
-	status = essential
-[submodule "qtactiveqt"]
-	depends = qtbase
-	path = qtactiveqt
-	url = ../qtactiveqt.git
-	branch = 5.6
-	status = addon
 [submodule "qtscript"]
 	depends = qtbase
-	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
 	branch = 5.6
-	status = deprecated
-[submodule "qtmultimedia"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtmultimedia
-	url = ../qtmultimedia.git
-	branch = 5.6
 	status = essential
-[submodule "qttools"]
-	depends = qtbase
-	recommends = qtdeclarative qtactiveqt qtwebkit
-	path = qttools
-	url = ../qttools.git
-	branch = 5.6
-	status = essential
-[submodule "qtxmlpatterns"]
-	depends = qtbase
-	path = qtxmlpatterns
-	url = ../qtxmlpatterns.git
-	branch = 5.6
-	status = addon
-[submodule "qttranslations"]
-	depends = qttools
-	path = qttranslations
-	url = ../qttranslations.git
-	branch = 5.6
-	status = essential
-	priority = 30
-[submodule "qtdoc"]
-	depends = qtdeclarative
-	path = qtdoc
-	url = ../qtdoc.git
-	branch = 5.6
-	status = essential
-	priority = 40
-[submodule "qtrepotools"]
-	path = qtrepotools
-	url = ../qtrepotools.git
-	branch = master
-	status = essential
-	project = -
-[submodule "qtwebkit"]
-	depends = qtbase
-	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
-	serialize = qtwebengine
-	path = qtwebkit
-	url = ../qtwebkit.git
-	branch = 5.6
-	status = obsolete
-	project = WebKit.pro
-	priority = 20
-[submodule "qtwebkit-examples"]
-	depends = qtwebkit qttools
-	path = qtwebkit-examples
-	url = ../qtwebkit-examples.git
-	branch = 5.6
-	status = obsolete
-[submodule "qtqa"]
-	depends = qtbase
-	path = qtqa
-	url = ../qtqa.git
-	branch = master
-	status = essential
-	priority = 50
-[submodule "qtlocation"]
-	depends = qtbase
-	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
-	path = qtlocation
-	url = ../qtlocation.git
-	branch = 5.6
-	status = addon
-[submodule "qtsensors"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsensors
-	url = ../qtsensors.git
-	branch = 5.6
-	status = addon
-[submodule "qtsystems"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtsystems
-	url = ../qtsystems.git
-	branch = dev
-	status = ignore
-[submodule "qtfeedback"]
-	depends = qtdeclarative
-	recommends = qtmultimedia
-	path = qtfeedback
-	url = ../qtfeedback.git
-	branch = master
-	status = ignore
-[submodule "qtdocgallery"]
-	depends = qtdeclarative
-	path = qtdocgallery
-	url = ../qtdocgallery.git
-	branch = master
-	status = ignore
-[submodule "qtpim"]
-	depends = qtdeclarative
-	path = qtpim
-	url = ../qtpim.git
-	branch = dev
-	status = ignore
-[submodule "qtconnectivity"]
-	depends = qtbase
-	recommends = qtdeclarative qtandroidextras
-	path = qtconnectivity
-	url = ../qtconnectivity.git
-	branch = 5.6
-	status = addon
-[submodule "qtwayland"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwayland
-	url = ../qtwayland.git
-	branch = 5.6
-	status = addon
-[submodule "qt3d"]
-	depends = qtdeclarative qtimageformats
-	path = qt3d
-	url = ../qt3d.git
-	branch = 5.6
-	status = preview
-[submodule "qtimageformats"]
-	depends = qtbase
-	path = qtimageformats
-	url = ../qtimageformats.git
-	branch = 5.6
-	status = addon
-[submodule "qtquick1"]
-	depends = qtscript
-	recommends = qtsvg qtxmlpatterns
-	path = qtquick1
-	url = ../qtquick1.git
-	branch = 5.6
-	status = obsolete
-[submodule "qtgraphicaleffects"]
-	depends = qtdeclarative
-	path = qtgraphicaleffects
-	url = ../qtgraphicaleffects.git
-	branch = 5.6
-	status = addon
-[submodule "qtquickcontrols"]
-	depends = qtdeclarative
-	recommends = qtgraphicaleffects
-	path = qtquickcontrols
-	url = ../qtquickcontrols.git
-	branch = 5.6
-	status = essential
-[submodule "qtserialbus"]
-	depends = qtserialport
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.6
-	status = preview
-[submodule "qtserialport"]
-	depends = qtbase
-	path = qtserialport
-	url = ../qtserialport.git
-	branch = 5.6
-	status = addon
-[submodule "qtx11extras"]
-	depends = qtbase
-	path = qtx11extras
-	url = ../qtx11extras.git
-	branch = 5.6
-	status = addon
-[submodule "qtmacextras"]
-	depends = qtbase
-	path = qtmacextras
-	url = ../qtmacextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtwinextras"]
-	depends = qtbase
-	recommends = qtdeclarative qtmultimedia
-	path = qtwinextras
-	url = ../qtwinextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtandroidextras"]
-	depends = qtbase
-	path = qtandroidextras
-	url = ../qtandroidextras.git
-	branch = 5.6
-	status = addon
-[submodule "qtenginio"]
-	depends = qtdeclarative
-	path = qtenginio
-	url = ../qtenginio.git
-	branch = 5.6
-	status = deprecated
-[submodule "qtwebsockets"]
-	depends = qtbase
-	recommends = qtdeclarative
-	path = qtwebsockets
-	url = ../qtwebsockets.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebchannel"]
-	depends = qtbase
-	recommends = qtdeclarative qtwebsockets
-	path = qtwebchannel
-	url = ../qtwebchannel.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebengine"]
-	depends = qtquickcontrols qtwebchannel
-	recommends = qtlocation
-	path = qtwebengine
-	url = ../qtwebengine.git
-	branch = 5.6
-	status = addon
-	priority = 10
-[submodule "qtcanvas3d"]
-	depends = qtdeclarative
-	path = qtcanvas3d
-	url = ../qtcanvas3d.git
-	branch = 5.6
-	status = addon
-[submodule "qtwebview"]
-	depends = qtdeclarative
-	recommends = qtwebengine
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.6
-	status = addon
-[submodule "qtquickcontrols2"]
-	depends = qtquickcontrols
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.6
-	status = preview
-[submodule "qtpurchasing"]
-	depends = qtbase qtandroidextras
-	recommends = qtdeclarative
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = dev
-	status = ignore

coin/platform_configs/default.txt

@@ -1,25 +1,10 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release BuildExamples
+qtci-windows-7-x86-2                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-8.1-x86_64                                             MSVC2012    DeveloperBuild Release QtNamespace QtLibInfix
+qtci-windows-10-x86_64-8                                x86         MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-8.1-x86_64                                 x86         MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-8                                            MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-8.1-x86_64                                             MSVC2013    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-7-x86-3                                                MSVC2010    Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
-qtci-windows-7-x86-3                                                Mingw49     Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-14.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation
-qtci-windows-8.1-x86_64             Windows_Phone_8_1   armv4       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-8.1-x86_64             WinRT_8_1                       MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-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-3                                             Clang       Packaging DebugAndRelease Release
+qtci-osx-10.11-x86_64                                               Clang       Packaging 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-linux-RHEL-6.6-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-14.04-x86_64-1    Boot2Qt_Fido        armv7       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-1                                    GCC         TestOnly LicenseCheck
-qtci-windows-7-x86-3                Windows_7_Embedded  armv4       MSVC2008    DeveloperBuild Release DisableTests OpenGLES2

coin/platform_configs/qt5.txt

@@ -1,15 +1,2 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -----------------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64     Windows_Phone_8_1   x86         MSVC2013    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe
-qtci-linux-RHEL-6.6-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-7-x86-3        Android_ANY         armv7       Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
-qtci-windows-7-x86-3        Android_ANY         x86         Mingw49     Packaging Release DisableTests OpenGLES2 UploadConfigureExe
-qtci-osx-10.11-x86_64-3     Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2
-qtci-osx-10.11-x86_64-3     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-10-x86_64-10   QNX_660             armv7       Mingw53     Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_660             x86         Mingw53     Packaging Release DisableTests OpenGLES2
-# target arch is used here only for documentation the value is ignored
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release DisableTests UploadConfigureExe

coin/pre-provisioning/qtci-windows-10-x86/06-msvc_2017_build_tools.ps1

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Visual Studio 2017 Build Tools
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

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

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
 
 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs

coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Visual Studio 2017
 

coin/pre-provisioning/qtci-windows-10-x86_64/06-msvc_2017_build_tools.ps1

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Visual Studio 2017 Build Tools
 # https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2017

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

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\..\provisioning\common\helpers.ps1"
 
 # Install Visual Studio $version with $update_version
 # Original download page: https://www.visualstudio.com/en-us/news/releasenotes/vs2015-update3-vs

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

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Visual Studio 2017
 

coin/provisioning/common/InstallPKGFromURL.sh

@@ -33,8 +33,8 @@
 ##
 #############################################################################
 
-# shellcheck source=../unix/try_catch.sh
+# shellcheck source=try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
+source "${BASH_SOURCE%/*}/try_catch.sh"
 
 ExceptionCreateTmpFile=100
 ExceptionDownloadPrimaryUrl=101

coin/provisioning/common/cmake_linux.sh

@@ -37,8 +37,8 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh
+# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
+source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
 
 version="3.6.2"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz"

coin/provisioning/common/disable-windows-updates.ps1

@@ -1,8 +1,6 @@
-#!/usr/bin/env bash
+############################################################################
-
-#############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## 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.
@@ -33,8 +31,7 @@
 ##
 #############################################################################
 
-set -ex
+# This script disables the automatic Windows updates
-
-echo "Disable Network Time Protocol (NTP)"
-echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile
 
+stop-service wuauserv
+set-service wuauserv –startup disabled

coin/provisioning/common/helpers.ps1

@@ -81,17 +81,6 @@ function Download
     }
 }
 
-function Set-EnvironmentVariable
-{
-    Param (
-        [string]$Key = $(BadParam("a key")),
-        [string]$Value = $(BadParam("a value."))
-    )
-    Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`""
-
-    [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine)
-}
-
 function Add-Path
 {
     Param (

coin/provisioning/common/install-dependencywalker.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Dependency Walker 2.2.6000
 

coin/provisioning/common/install-git.ps1

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # Install Git version 2.13.0
 

coin/provisioning/common/install-java.ps1

@@ -31,13 +31,11 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Java RE
 # Official Java RE 7 downloads require Oracle accounts. Using local mirrors only.
 
-$installdir = "C:\Program Files\Java\jre7"
-
 $version = "7u7"
 if( (is64bitWinHost) -eq 1 ) {
     $arch = "x64"
@@ -55,8 +53,4 @@ Copy-Item $url_cache $javaPackage
 cmd /c "$javaPackage /s SPONSORS=0"
 echo "Cleaning $javaPackage.."
 Remove-Item -Recurse -Force "$javaPackage"
-
-[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
-Add-Path "$installdir\bin"
-
 echo "Java = $version $arch" >> ~\versions.txt

coin/provisioning/common/install-jdk.ps1

@@ -1,78 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-. "$PSScriptRoot\..\common\helpers.ps1"
-
-# This script will install Java SE
-
-$installdir = "C:\Program Files\Java\jdk1.8.0_144"
-
-$version = "8u144"
-if( (is64bitWinHost) -eq 1 ) {
-    $arch = "x64"
-    $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
-}
-else {
-    $arch = "i586"
-    $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
-}
-
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
-$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
-$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
-
-echo "Fetching Java SE $version..."
-$ProgressPreference = 'SilentlyContinue'
-try {
-    echo "...from local cache"
-    Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage
-} catch {
-    echo "...from oracle.com"
-    $client = new-object System.Net.WebClient
-    $cookie = "oraclelicense=accept-securebackup-cookie"
-    $client.Headers.Add("Cookie", $cookie)
-    $client.DownloadFile($official_url, $javaPackage)
-
-    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
-}
-
-Verify-Checksum $javaPackage $sha1
-
-cmd /c "$javaPackage /s SPONSORS=0"
-echo "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force "$javaPackage"
-
-[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
-Add-Path "$installdir\bin"
-
-echo "Java SE = $version $arch" >> ~\versions.txt

coin/provisioning/common/install-mingw.ps1

@@ -0,0 +1,26 @@
+function InstallMinGW
+{
+    Param (
+        [string] $version     = $(BadParam("the version being printed to versions.txt")),
+        [string] $release     = $(BadParam("release part of the file name"))
+    )
+
+    $envvar = "MINGW$version"
+    $envvar = $envvar -replace '["."]'
+    $targetdir = "C:\$envvar"
+    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\i686-" + $version + "-" + $release + ".7z"
+
+    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
+    Copy-Item $url_cache $mingwPackage
+
+    Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
+
+    echo "Adding MinGW environment variable."
+    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
+
+    echo "Cleaning $mingwPackage.."
+    Remove-Item -Recurse -Force "$mingwPackage"
+
+    echo "MinGW = $version $release" >> ~\versions.txt
+
+}

coin/provisioning/common/install-notepad++.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Notepad++
 
@@ -57,6 +57,11 @@ Remove-Item -Recurse -Force "$nppPackage"
 
 echo "Notepad++ = $version" >> ~\versions.txt
 
-Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
+if( (is64bitWinHost) -eq 1 ) {
+    Rename-Item -Path "C:\Program Files (x86)\Notepad++\updater" -NewName "updater_disabled"
+}
+else {
+    Rename-Item -Path "C:\Program Files\Notepad++\updater" -NewName "updater_disabled"
+}
 
 echo "Auto-updating disabled."

coin/provisioning/common/install-qnx660.ps1

@@ -38,7 +38,7 @@
 $version = "6.6.0"
 $nondottedversion = $version -replace '[.]',''
 $targetFolder = "c:"
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + "-patch4687-windows.zip"
+$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\qnx" + $nondottedversion + ".zip"
 
 Get-ChildItem $url_cache | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o"C:\"}
 

coin/provisioning/common/install-ruby.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Ruby
 

coin/provisioning/common/install-sevenzip.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script installs 7-Zip
 

coin/provisioning/common/install-strawberry-perl.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script installs Strawberry Perl
 

coin/provisioning/common/linux/disable-ntp_linux.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2018 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 -ex
-
-echo "Disable Network Time Protocol (NTP)"
-
-if uname -a |grep -q "Ubuntu"; then
-    sudo timedatectl set-ntp false
-else
-    systemctl &>/dev/null && sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off
-fi

coin/provisioning/common/macos/InstallAppFromCompressedFileFromURL.sh

@@ -1,136 +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 receives URLs to a compressed file. It then downloads it,
-# uncompresses it and installs it by default
-# to /Applications/. This can be overridden by a target parameter.
-
-# shellcheck source=../unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-ExceptionDownload=99
-ExceptionCreateTmpFile=100
-ExceptionCreateTmpDirectory=101
-ExceptionUncompress=102
-ExceptionMoveApp=103
-ExceptionDeleteTmpFile=104
-ExceptionRemoveTmpDirectory=105
-ExceptionUnknownFormat=106
-
-
-function InstallAppFromCompressedFileFromURL {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    appPrefix=$4
-    target=$5
-
-    if [ "" == "$target" ]; then
-        target="/Applications/"
-    fi
-
-    try
-    (
-        basefilename=${url##*/}
-        extension=${basefilename##*.}
-        filename=${basefilename%.*}
-        if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then
-            extension="tar.gz"
-        fi
-
-        echo "Extension for file: $extension"
-        echo "Creating temporary file and directory"
-        targetFile=$(mktemp "$TMPDIR$(uuidgen).$extension") || throw $ExceptionCreateTmpFile
-        # macOS 10.10 mktemp does require prefix
-        if [[ $OSTYPE == "darwin14" ]]; then
-            targetDirectory=$(mktemp -d -t '10.10') || throw $ExceptionCreateTmpDirectory
-        else
-            targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
-        fi
-        (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile") || throw $ExceptionDownload
-        echo "Uncompress $targetFile"
-        case $extension in
-            "tar.gz")
-                tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            "zip")
-                unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress
-            ;;
-            *)
-                throw $ExceptionUnknownFormat
-            ;;
-        esac
-        echo "Moving app to '$target'"
-        sudo mv "$targetDirectory/$appPrefix/"* "$target" || throw $ExceptionMoveApp
-        echo "Removing file '$targetFile'"
-        rm "$targetFile" || throw $ExceptionDeleteTmpFile
-        echo "Removing directory '$targetDirectory'"
-        rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory
-    )
-
-    catch || {
-        case $ex_code in
-            $ExceptionDownload)
-                exit 1;
-            ;;
-            $ExceptionCreateTmpFile)
-                echo "Failed to create temporary file"
-                exit 1;
-            ;;
-            $ExceptionUncompress)
-                echo "Failed extracting compressed file."
-                exit 1;
-            ;;
-            $ExceptionMoveApp)
-                echo "Failed moving app to '$target'."
-                exit 1;
-            ;;
-            $ExceptionDeleteTmpFile)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionRemoveTmpDirectory)
-                echo "Failed deleting temporary file."
-                exit 1;
-            ;;
-            $ExceptionUnknownFormat)
-                echo "Unknown file format."
-                exit 1;
-            ;;
-        esac
-    }
-}

coin/provisioning/common/macos/cmake.sh

@@ -1,51 +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 CMake
-
-# CMake is needed for autotests that verify that Qt can be built with CMake
-
-# shellcheck source=./InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz"
-AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz"
-SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e"
-appPrefix="cmake-3.6.2-Darwin-x86_64"
-
-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
-
-echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc
-echo "CMake = 3.6.2" >> ~/versions.txt

coin/provisioning/common/macos/homebrew.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-# Will install homebrew package manager for macOS
-/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" </dev/null

coin/provisioning/common/macos/install-commandlinetools.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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$
-##
-#############################################################################
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-set -ex
-
-# Command line tools is need by Homebrew
-
-function InstallCommandLineTools {
-
-    ExceptionMount=101
-    ExceptionInstall=102
-    ExceptionUnmount=103
-
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    packageName=$4
-    version=$5
-
-    try
-    (
-        DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
-        echo "Mounting $packageName"
-        hdiutil attach /tmp/$packageName || throw $ExceptionMount
-        cd "/Volumes/Command Line Developer Tools"
-        echo "Installing"
-        sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall
-        cd /
-        # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
-        sleep 3
-        echo "Unmounting"
-        umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount
-        echo "Removing $packageName"
-        rm /tmp/$packageName
-
-        echo "Command Line Tools = $version" >> ~/versions.txt
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionMount)
-                echo "Failed to mount."
-                exit 1;
-            ;;
-            $ExceptionInstall)
-                echo "Failed to install command line tools."
-                exit 1;
-            ;;
-            $ExceptionUnmount)
-                echo "Failed to unmount."
-                exit 1;
-
-        esac
-    }
-
-}

coin/provisioning/common/macos/install_xcode.sh

@@ -1,91 +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 Xcode
-# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
-# This can be achieved by fetching Xcode_8.xip from Apple Store.
-# Uncompress it with 'xar -xf Xcode_8.xip'
-# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
-# with which you can run 'python parse_pbzx2.py Content'.
-# This will give you a file called "Content.part00.cpio.xz" that
-# can be renamed to Xcode_8.xz for this script.
-
-
-
-# shellcheck source=../unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../unix/try_catch.sh"
-
-function InstallXCode()
-{
-    ExceptionCPIO=103
-    ExceptionAcceptLicense=105
-    ExceptionDeveloperMode=113
-
-    sourceFile=$1
-    version=$2
-
-    try
-    (
-        echo "Uncompressing and installing '$sourceFile'"
-        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO
-
-        echo "Accept license"
-        sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
-
-        echo "Enabling developer mode, so that using lldb does not require interactive password entry"
-        sudo /usr/sbin/DevToolsSecurity -enable || throw $ExceptionDeveloperMode
-
-        echo "Xcode = $version" >> ~/versions.txt
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionCPIO)
-                echo "Failed to unarchive .cpio."
-                exit 1;
-            ;;
-            $ExceptionDeveloperMode)
-                echo "Failed to enable developer mode."
-                exit 1;
-            ;;
-            $ExceptionAcceptLicense)
-                echo "Failed to accept license."
-                exit 1;
-            ;;
-
-        esac
-    }
-
-}
-

coin/provisioning/common/mesa_llvmpipe.ps1

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 $version = "11_2_2"
 $package = "C:\Windows\temp\opengl32sw.7z"

coin/provisioning/common/msvc_2015_update3_patch.ps1

@@ -30,7 +30,7 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # Install Cumulative Servicing Release Visual Studio 2015 update 3
 # Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx

coin/provisioning/common/openssl.ps1

@@ -31,7 +31,7 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script installs OpenSSL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine

coin/provisioning/common/set-network-test-server.ps1

@@ -31,11 +31,11 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will set the network test server IP in to hosts file
 
-$n = Get-Content "$PSScriptRoot\..\shared\network_test_server_ip.txt"
+$n = Get-Content "$PSScriptRoot\network_test_server_ip.txt"
 $n = $n.Split('=')
 New-Variable -Name $n[0] -Value $n[1]
 

coin/provisioning/common/unix/libclang.sh

@@ -1,72 +0,0 @@
-#!/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$
-##
-#############################################################################
-
-# PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/).
-# The Clang library (C-bindings), version 3.9 or higher is required for building.
-
-# This same script is used to provision libclang to Linux and macOS.
-# In case of Linux, we expect to get the values as args
-set -e
-
-BASEDIR=$(dirname "$0")
-url=$1
-sha1=$2
-version=$3
-if [ $# -eq 0 ]
-  then
-    # The default values are for macOS package
-    echo "Using macOS defaults"
-    version="4.0"
-    url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z"
-    sha1="4781d154b274b2aec99b878c364f0ea80ff00a80"
-fi
-
-zip="libclang.7z"
-destination="/usr/local/libclang-$version"
-
-curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
-_shasum=sha1sum
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    echo "DARWIN"
-    _shasum=/usr/bin/shasum
-fi
-echo "$sha1  $zip" | $_shasum --check
-7z x $zip -o/tmp/
-rm -rf $zip
-
-sudo mv /tmp/libclang $destination
-
-echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
-echo "libClang = $version" >> ~/versions.txt

coin/provisioning/common/windows/disable-ntp.ps1

@@ -1,2 +0,0 @@
-# Disable the NTP from syncing
-w32tm /config /syncfromflags:NO

coin/provisioning/common/windows/disable-windows-updates.ps1

@@ -1,54 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script disables the automatic Windows updates
-
-$service = get-service wuauserv
-if (-not $service) {
-    Write-Host "Windows Update service not found."
-    exit 0
-}
-
-if ($service.Status -eq "Stopped") {
-    Write-Host "Windows Update service already stopped."
-} else {
-    Write-Host "Stopping Windows Update service."
-    stop-service wuauserv
-}
-
-$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode"
-if ($startup -ne "Disabled") {
-    set-service wuauserv -startup disabled
-} else {
-    Write-Host "Windows Update service startup already disabled."
-}

coin/provisioning/common/windows/install-jdk.ps1

@@ -1,78 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-. "$PSScriptRoot\helpers.ps1"
-
-# This script will install Java SE
-
-$installdir = "C:\Program Files\Java\jdk1.8.0_144"
-
-$version = "8u144"
-if( (is64bitWinHost) -eq 1 ) {
-    $arch = "x64"
-    $sha1 = "adb03bc3f4b40bcb3227687860798981d58e1858"
-}
-else {
-    $arch = "i586"
-    $sha1 = "3b9ab95914514eaefd72b815c5d9dd84c8e216fc"
-}
-
-$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe"
-$official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe"
-$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
-
-echo "Fetching Java SE $version..."
-$ProgressPreference = 'SilentlyContinue'
-try {
-    echo "...from local cache"
-    Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage
-} catch {
-    echo "...from oracle.com"
-    $client = new-object System.Net.WebClient
-    $cookie = "oraclelicense=accept-securebackup-cookie"
-    $client.Headers.Add("Cookie", $cookie)
-    $client.DownloadFile($official_url, $javaPackage)
-
-    Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage
-}
-
-Verify-Checksum $javaPackage $sha1
-
-cmd /c "$javaPackage /s SPONSORS=0"
-echo "Cleaning $javaPackage.."
-Remove-Item -Recurse -Force "$javaPackage"
-
-[Environment]::SetEnvironmentVariable("JAVA_HOME", "$installdir", [EnvironmentVariableTarget]::Machine)
-Add-Path "$installdir\bin"
-
-echo "Java SE = $version $arch" >> ~\versions.txt

coin/provisioning/common/windows/install-mingw.ps1

@@ -1,68 +0,0 @@
-############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the provisioning scripts of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-############################################################################
-
-. "$PSScriptRoot\helpers.ps1"
-
-function InstallMinGW
-{
-    Param (
-        [string] $release = $(BadParam("release file name")),
-        [string] $sha1    = $(BadParam("SHA1 checksum of the file"))
-    )
-
-    $arch, $version, $null, $threading, $ex_handling, $build_ver, $revision = $release.split('-')
-
-    if ($arch -eq "i686") { $win_arch = "Win32" }
-    elseif ($arch -eq "x86_64") { $win_arch = "Win64" }
-
-    $envvar = "MINGW$version"
-    $envvar = $envvar -replace '["."]'
-    $targetdir = "C:\$envvar"
-    $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $release + ".7z"
-    $url_official = "https://netcologne.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20" + $win_arch + "/Personal%20Builds/mingw-builds/" + $version + "/threads-" + $threading + "/" + $ex_handling + "/" + $arch + "-" + $version + "-release-" + $threading + "-" + $ex_handling + "-" + $build_ver + "-" + $revision + ".7z"
-
-    $mingwPackage = "C:\Windows\Temp\MinGW-$version.zip"
-    Download $url_official $url_cache $mingwPackage
-    Verify-Checksum $mingwPackage $sha1
-
-    Get-ChildItem $mingwPackage | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname "-o$TARGETDIR"}
-
-    echo "Adding MinGW environment variable."
-    [Environment]::SetEnvironmentVariable("$envvar", "$targetdir\mingw32", [EnvironmentVariableTarget]::Machine)
-
-    echo "Cleaning $mingwPackage.."
-    Remove-Item -Recurse -Force "$mingwPackage"
-
-    echo "MinGW = $version $release" >> ~\versions.txt
-
-}

coin/provisioning/common/windows_removethemall.ps1

@@ -56,8 +56,6 @@ Function Remove-Path {
 }
 
 # Remove Android sdk and ndk
-If (Test-Path "c:\utils") {
+dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
-    dir c:\utils\android* | ForEach { Rename-Item $_ $_"-deleted" }
+[Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
-    [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User")
+[Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
-    [Environment]::SetEnvironmentVariable("ANDROID_SDK_HOME",$null,"User")
-}

coin/provisioning/qtci-linux-OpenSuSE-13.01-x86_64/02-disable-ntp.sh

@@ -1,2 +0,0 @@
-#!/usr/bin/env bash
-source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/02-disable-ntp.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh

@@ -1 +1 @@
-$(dirname $0)/../common/linux/cmake_linux.sh
+$(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh

@@ -41,4 +41,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt
 echo "*********************************************" >> ~/versions.txt
 
-$(dirname $0)/../common/linux/version.sh
+$(dirname $0)/../common/version.sh

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/02-disable-ntp.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh

@@ -1 +1 @@
-$(dirname $0)/../common/linux/cmake_linux.sh
+$(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/system_updates.sh
+$BASEDIR/../common/system_updates.sh

coin/provisioning/qtci-osx-10.10-x86_64/01-macos-removethemall.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 BASEDIR=$(dirname "$0")
-source "$BASEDIR/../common/macos/01-macos-removethemall.sh"
+source "$BASEDIR/../common/01-macos-removethemall.sh"
 

coin/provisioning/qtci-osx-10.10-x86_64/02-disable-ntp.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh

@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
+source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/system_updates.sh
+$BASEDIR/../common/system_updates.sh

coin/provisioning/qtci-osx-10.11-x86_64/002-disable-screensaver.sh

@@ -0,0 +1,26 @@
+#!/bin/sh
+
+mkdir -p $HOME/Library/LaunchAgents
+cat >$HOME/Library/LaunchAgents/no-screensaver.plist <<EOT
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple/DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>org.qt.io.screensaver_disable</string>
+        <key>ProgramArguments</key>
+        <array>
+            <string>defaults</string>
+            <string>-currentHost</string>
+            <string>write</string>
+            <string>com.apple.screensaver</string>
+            <string>idleTime</string>
+            <string>0</string>
+        </array>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>KeepAlive</key>
+        <false/>
+    </dict>
+</plist>
+EOT

coin/provisioning/qtci-osx-10.11-x86_64/004-fix-virtualenv.sh

@@ -1,37 +1,5 @@
 #!/usr/bin/env bash
-set -e
+
-#############################################################################
-##
-## Copyright (C) 2018 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$
-##
-#############################################################################
 # macOS 10.11 template doesn't have working virtualenv installation.
 # To fix that, we first have to install pip to install virtualenv
 # Install pip
@@ -39,12 +7,11 @@ curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
 sudo python get-pip.py
 rm get-pip.py
 
-# remove possible link pointing to broken virtualenv
+# remove link pointing to broken virtualenv
-sudo rm -f /opt/local/bin/virtualenv
+sudo rm /opt/local/bin/virtualenv
 sudo pip install virtualenv
 
-# make sure it is now in PATH
+# fix the link. This is optional, while the new installation is
-which virtualenv
+# already in PATH, but there will be virtualenv-2.6 in /opt/local/bin
-if [[ $? -ne 0 ]]; then
+# which might be confusing
-    exit 1
+sudo ln -s /usr/local/bin/virtualenv /opt/local/bin/virtualenv
-fi

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

@@ -1,129 +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 modified system settings for automated use
-
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
-VNCPassword=qt
-NTS_IP=10.212.2.216
-
-ExceptionDisableScreensaver=100
-ExceptionSetInitialDelay=101
-ExceptionSetDelay=102
-ExceptionVNC=103
-ExceptionNTS=104
-ExceptionDisableScreensaverPassword=105
-
-try
-(
-    echo "Disable Screensaver"
-    # For current session
-    defaults -currentHost write com.apple.screensaver idleTime 0 || throw $ExceptionDisableScreensaver
-
-    # For session after a reboot
-    mkdir -p "$HOME/Library/LaunchAgents" || throw $ExceptionDisableScreensaver
-    (
-        cat >"$HOME/Library/LaunchAgents/no-screensaver.plist" <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-
-<plist version="1.0">
-    <dict>
-        <key>Label</key>
-        <string>org.qt.io.screensaver_disable</string>
-        <key>ProgramArguments</key>
-        <array>
-            <string>defaults</string>
-            <string>-currentHost</string>
-            <string>write</string>
-            <string>com.apple.screensaver</string>
-            <string>idleTime</string>
-            <string>0</string>
-        </array>
-        <key>RunAtLoad</key>
-        <true/>
-        <key>KeepAlive</key>
-        <false/>
-    </dict>
-</plist>
-EOT
-    ) || throw $ExceptionDisableScreensaver
-
-    defaults write com.apple.screensaver askForPassword -int 0 || throw $ExceptionDisableScreensaverPassword
-
-    echo "Set keyboard type rates and delays"
-    # normal minimum is 15 (225 ms)
-    defaults write -g InitialKeyRepeat -int 15 || throw $ExceptionSetInitialDelay
-    # normal minimum is 2 (30 ms)
-    defaults write -g KeyRepeat -int 2 || throw $ExceptionSetDelay
-
-    echo "Enable remote desktop sharing"
-    sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw $VNCPassword -restart -agent -privs -all || throw $ExceptionVNC
-
-    echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
-    echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
-
-)
-catch || {
-    case $ex_code in
-        $ExceptionDisableScreensaver)
-            echo "Failed to disable screensaver."
-            exit 1;
-        ;;
-        $ExceptionSetInitialDelay)
-            echo "Failed to set initial delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionSetDelay)
-            echo "Failed to set delay of keyboard."
-            exit 1;
-        ;;
-        $ExceptionVNC)
-            echo "Failed to enable VNC."
-            exit 1;
-        ;;
-        $ExceptionNTS)
-            echo "Failed to set NTS."
-            exit 1;
-        ;;
-        $ExceptionDisableScreensaverPassword)
-            echo "Failed to disable requiring of password after screensaver is enabled."
-            exit 1;
-        ;;
-    esac
-}
-

coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-# Enables the usage of temporary keychains for SSL autotests
-echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc

coin/provisioning/qtci-osx-10.11-x86_64/01-macos-removethemall.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+BASEDIR=$(dirname "$0")
+source "$BASEDIR/../common/01-macos-removethemall.sh"
+

coin/provisioning/qtci-osx-10.11-x86_64/02-disable-ntp.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-$(dirname $0)/../common/unix/disable-ntp_macos.sh

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

@@ -1,129 +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 JDK
-echo "Installing Java Development Kit"
-
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
-ExceptionDownloadPrimaryUrl=100
-ExceptionDownloadAltUrl=101
-ExceptionSHA1=102
-ExceptionAttachImage=103
-ExceptionInstall=104
-ExceptionDetachImage=105
-ExceptionRemoveTmpFile=106
-ExceptionDisableAutoUpdate=107
-
-
-url=http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/jdk-8u102-macosx-x64.dmg
-url_alt=http://download.oracle.com/otn-pub/java/jdk/8u102-b14/jdk-8u102-macosx-x64.dmg
-targetFile=/tmp/jdk-8u102-macosx-x64.dmg
-expectedSha1=1405af955f14e32aae187b5754a716307db22104
-
-try
-(
-    try
-    (
-        echo "Downloading from primary URL '$url'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl
-    )
-    catch || {
-        case $ex_code in
-            $ExceptionDownloadPrimaryUrl)
-                echo "Failed to download '$url' multiple times"
-                echo "Downloading tar.gz from alternative URL '$url_alt'"
-                curl --fail -L --retry 5 --retry-delay 5 -j -k -H "Cookie: oraclelicense=accept-securebackup-cookie" -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
-            ;;
-        esac
-    }
-    echo "Checking SHA1 on '$targetFile'"
-    echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
-
-    echo Mounting DMG
-    hdiutil attach "$targetFile" || throw $ExceptionAttachImage
-
-    echo Installing JDK
-    (cd /Volumes/JDK\ 8\ Update\ 102/ && sudo installer -package JDK\ 8\ Update\ 102.pkg -target /) || throw $ExceptionInstall
-
-    disk=`hdiutil info | grep '/Volumes/JDK 8 Update 102' | awk '{print $1}'`
-    hdiutil detach $disk || throw $ExceptionDetachImage
-
-    echo "Removing temporary file '$targetFile'"
-    rm "$targetFile" || throw $ExceptionRemoveTmpFile
-
-    echo "Disable auto update"
-    sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false || throw $ExceptionDisableAutoUpdate
-
-    echo "JDK Version = 8 update 102" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionDownloadPrimaryUrl)
-            echo "Failed to download JDK from primary URL."
-            exit 1;
-        ;;
-        $ExceptionDownloadAltUrl)
-            echo "Failed to download JDK from alternative URL."
-            exit 1;
-        ;;
-        $ExceptionSHA1)
-            echo "Failed to check SHA1."
-            exit 1;
-        ;;
-        $ExceptionAttachImage)
-            echo "Failed to attach image."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to install JDK."
-            exit 1;
-        ;;
-        $ExceptionDetachImage)
-            echo "Failed to detach image."
-            exit 1;
-        ;;
-        $ExceptionRemoveTmpFile)
-            echo "Failed to remove temporary file."
-            exit 1;
-        ;;
-        $ExceptionDisableAutoUpdate)
-            echo "Failed to disable auto update."
-            exit 1;
-        ;;
-
-    esac
-}

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

@@ -1,53 +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 Xcode
-# Prerequisites: Have Xcode prefetched to local cache as xz compressed.
-# This can be achieved by fetching Xcode_8.xip from Apple Store.
-# Uncompress it with 'xar -xf Xcode_8.xip'
-# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py
-# with which you can run 'python parse_pbzx2.py Content'.
-# This will give you a file called "Content.part00.cpio.xz" that
-# can be renamed to Xcode_8.xz for this script.
-
-
-
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-
-# shellcheck source=../common/macos/install_xcode.sh
-source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
-
-InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.2.xz 8.2

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

@@ -1,43 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2017 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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$
-##
-#############################################################################
-source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
-
-version="8.2"
-packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg"
-url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
-sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25"
-
-InstallCommandLineTools $url $url $sha1 $packageName $version
-

coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/cmake.sh

coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/homebrew.sh

coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh

@@ -1,55 +0,0 @@
-#!/bin/bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite 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 MySQL
-
-# MySQL is needed for Qt to be able to support MySQL
-
-# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz"
-AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz"
-SHA1="07949bd42f350b0504a1536b8830b809b4a34fca"
-appPrefix=""
-targetDir="/opt/mysql57/"
-
-sudo mkdir -p "/opt"
-
-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir"
-
-echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc
-echo "MySQL = 5.7.15" >> ~/versions.txt
-

coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh

@@ -1,52 +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 PostgreSQL
-
-# PostgreSQL is needed for Qt to be able to support PostgreSQL
-
-# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh"
-
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip"
-AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip"
-SHA1="5078e44663787006ca55fa3b5e2be598bed82eb5"
-appPrefix=""
-
-InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
-
-echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc
-echo "PostgreSQL = 9.6.0" >> ~/versions.txt
-

coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh

@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
+source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-# Install 7z to be used from command line
-brew update
-brew install p7zip

coin/provisioning/qtci-osx-10.11-x86_64/027-libclang.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-# requires: 7z
-
-BASEDIR=$(dirname "$0")
-# There is only one mac package and common script uses it as a default
-$BASEDIR/../common/unix/libclang.sh

coin/provisioning/qtci-osx-10.11-x86_64/035-openssl.sh

@@ -1,116 +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 install OpenSSL
-
-# shellcheck source=../common/unix/try_catch.sh
-source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh"
-# shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh
-source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh"
-
-opensslVersion="1.0.2k"
-opensslFile="openssl-$opensslVersion.tar.gz"
-opensslDlUrl="http://ci-files01-hki.intra.qt.io/input/openssl/$opensslFile"
-opensslAltDlUrl="https://www.openssl.org/source/$opensslFile"
-opensslSha1="5f26a624479c51847ebd2f22bb9f84b3b44dcb44"
-
-# Below target location has been hard coded into Coin.
-# QTQAINFRA-1195
-opensslTargetLocation="/usr/local/opt/openssl"
-
-ExceptionCD=100
-ExceptionConfig=101
-ExceptionMake=102
-ExceptionInstall=103
-ExceptionLN=104
-ExceptionCertificate=105
-ExceptionCleanup=106
-
-try
-(
-    InstallFromCompressedFileFromURL "$opensslDlUrl" "$opensslAltDlUrl" "$opensslSha1" "/tmp/openssl-$opensslVersion" "openssl-$opensslVersion"
-    cd "/tmp/openssl-$opensslVersion" || throw $ExceptionCD
-    sudo ./config --prefix=/usr/local/openssl-$opensslVersion || throw $ExceptionConfig
-    echo "Running 'make' for OpenSSL"
-    sudo make --silent > /tmp/openssl_make.log 2>&1 || throw $ExceptionMake
-    echo "Running 'make install' for OpenSSL"
-    sudo make --silent install > /tmp/openssl_make_install.log 2>&1 || throw $ExceptionInstall
-
-    path=$(echo "$opensslTargetLocation" | sed -E 's/(.*)\/.*$/\1/')
-    sudo mkdir -p "$path"
-    sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN
-
-    echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc
-    echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc
-
-    security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
-    security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate
-
-    sudo rm -rf /tmp/openssl-$opensslVersion || throw $ExceptionCleanup
-
-    echo "OpenSSL = $opensslVersion" >> ~/versions.txt
-)
-catch || {
-    case $ex_code in
-        $ExceptionCD)
-            echo "Failed to change directory to /tmp/openssl-$opensslVersion."
-            exit 1;
-        ;;
-        $ExceptionConfig)
-            echo "Failed to run config for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionMake)
-            echo "Failed to run 'make' for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionInstall)
-            echo "Failed to run 'make install' for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionLN)
-            echo "Failed to create a soft link for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionCertificate)
-            echo "Failed to install Certificate for OpenSSL."
-            exit 1;
-        ;;
-        $ExceptionCleanup)
-            echo "Failed to clean up /tmp/openssl-$opensslVersion."
-            exit 1;
-        ;;
-    esac
-}

coin/provisioning/qtci-osx-10.11-x86_64/555-signtools.sh

@@ -1,138 +0,0 @@
-#!/bin/sh
-
-#############################################################################
-##
-## 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$
-##
-#############################################################################
-
-# Install tools for signing packages
-# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed.
-
-set -ex
-
-cache="http://ci-files01-hki.intra.qt.io/input"
-cacheSigningTools="$cache/mac/sign_tools"
-targetFolder="/Users/qt"
-keychains="$targetFolder/Library/Keychains"
-
-Install() {
-
-    url=$1
-    targetFile=$2
-    expectedSha1=$3
-
-    echo "Fetching $targetFile from $url..."
-    curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile"
-    shasum "$targetFile" |grep "$expectedSha1"
-
-}
-
-# qt-license
-sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d"
-Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense
-
-# Login keychain
-sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
-Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword"
-loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt")
-loginKeychain=$keychains/login.keychain
-
-echo "Setting login.keychain as default keychain.."
-security default-keychain -s $loginKeychain*
-echo "Unlocking Login keychain with password.."
-security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*
-
-echo "remove the "Lock after X minutes of inactivity" from login.keychain"
-security set-keychain-settings $loginKeychain
-
-# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer
-sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64"
-Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA
-sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer"
-
-# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer
-sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186"
-Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA
-sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer"
-
-# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain'
-sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724"
-unlockKeychain=$targetFolder/unlock-keychain.sh
-Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain
-sudo chmod 755 "$unlockKeychain"
-
-# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed.
-shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910"
-csreq=$targetFolder/csreq_qt_company.txt
-Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq
-chmod 755 "$csreq"
-
-# iOS signing tools
-devIDKeychain="Developer_ID_TheQtCompany.keychain"
-shaDevIdKeychain="0420a129c17725a97afd6fdafeb9cddfb80a65ca"
-Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain
-echo "Opening $devIDKeychain.."
-open "$keychains/$devIDKeychain"
-
-sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6"
-Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword"
-DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt")
-
-echo "Unlocking $devIDKeychain with password.."
-security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain
-security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain
-
-sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
-Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios
-iosPassword=$(<"$targetFolder/ios_password.txt")
-
-iPhoneDeveloper="iosdevelopment2qtcompany.p12"
-shaIPhoneDeveloper="e7be33ca65886afcb3f41de17bb211310e199f8a"
-Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
-echo "Importing $iPhoneDeveloper.."
-security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
-
-iPhoneDistribution="iosdistribution.p12"
-shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
-Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
-echo "Importing $iPhoneDistribution.."
-security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign
-
-# Mobileprovision
-echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.."
-mkdir "$targetFolder/Library/MobileDevice"
-mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles"
-shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf"
-Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision
-
-# Removing password files
-rm -fr "$targetFolder/login_keychain_password.txt"
-

coin/provisioning/qtci-osx-10.11-x86_64/android.sh

@@ -41,7 +41,7 @@
 # E.g The Bluetooth features that require Android 18 will disable themselves dynamically when running on an Android 16 device.
 # That's why we need to use Andoid-18 API version and decision was made to use it also with Qt 5.6.
 
-set -ex
+set -e
 targetFolder="/opt/android"
 basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android"
 
@@ -50,14 +50,14 @@ sdkVersion="android-sdk_r24.4.1-macosx.zip"
 sdkBuildToolsVersion="24.0.2"
 sdkApiLevel="android-18"
 sdkSourceFile="$basePath/$sdkVersion"
-sdkExtract="unzip -q $sdkSourceFile -d $targetFolder"
+sdkExtract="unzip $sdkSourceFile -d $targetFolder"
 sdkFolderName="android-sdk-macosx"
 sdkName="sdk"
 
 # NDK
 ndkVersion="android-ndk-r10e-darwin-x86_64.zip"
 ndkSourceFile="$basePath/$ndkVersion"
-ndkExtract="unzip -q $ndkSourceFile -d $targetFolder"
+ndkExtract="unzip $ndkSourceFile -d $targetFolder"
 ndkFolderName="android-ndk-r10e"
 ndkName="ndk"
 
@@ -68,9 +68,9 @@ function InstallAndroidPackage {
     folderName=$4
     name=$5
 
-    sudo $extract
+    sudo $extract || echo "Failed to extract $url"
     sudo chown -R qt:wheel $targetFolder/$folderName
-    sudo mv $targetFolder/$folderName $targetFolder/$name
+    sudo mv $targetFolder/$folderName $targetFolder/$name || echo "Failed to rename $name"
 }
 
 sudo mkdir $targetFolder
@@ -84,17 +84,8 @@ InstallAndroidPackage $targetFolder $ndkVersion "$ndkExtract" $ndkFolderName $nd
 
 # run update for Android SDK and install SDK API version 18, latest SDK tools, platform-tools and build-tools
 echo "Running Android SDK update for API version 18, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion
+echo "y" |$targetFolder/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion || echo "Failed to run update"
 
 # For Qt 5.6, we by default require API levels 10, 11, 16 and 18, but we can override this by setting ANDROID_API_VERSION=android-18
 # From Qt 5.7 forward, if android-16 is not installed, Qt will automatically use more recent one.
-echo "export ANDROID_SDK_HOME=$targetFolder/$sdkName" >> ~/.bashrc
+echo 'export ANDROID_API_VERSION=android-18' >> ~/.bashrc
-echo "export ANDROID_NDK_HOME=$targetFolder/$ndkName" >> ~/.bashrc
-echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc
-echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
-
-echo "Android SDK tools = r24.4.1" >> ~/versions.txt
-echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-echo "Android NDK = r10e" >> ~/versions.txt
-

coin/provisioning/qtci-osx-10.11-x86_64/crashreporter.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-osx-10.8-x86_64/001-system_updates.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/system_updates.sh
+$BASEDIR/../common/system_updates.sh

coin/provisioning/qtci-osx-10.8-x86_64/004-fix-python2.sh

@@ -1,67 +0,0 @@
-#!/usr/bin/env bash
-set -e
-#############################################################################
-##
-## Copyright (C) 2018 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$
-##
-#############################################################################
-source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh"
-
-# macOS 10.8 template doesn't have working virtualenv installation.
-# To fix that, we first have to install pip to install virtualenv.
-# But before doing that, we have to delete all broken/wrong python
-# installs from the machine and install proper Python version
-# instead the default one.
-
-sudo rm -rf /opt/local/Library/Frameworks/Python.framework/
-sudo rm -rf /Library/Frameworks/Python.framework/
-sudo rm -rf /System/Library/Frameworks/Python.framework/Versions/2.7/
-sudo rm -rf /Users/qt/Python-2.7.6
-sudo rm -rf /Users/qt/python27
-
-sudo rm -f /opt/local/bin/python*
-sudo rm -f /opt/local/bin/pydoc*
-sudo rm -f /usr/bin/python*
-sudo rm -f /usr/bin/pydoc*
-sudo rm -f /usr/local/bin/python*
-sudo rm -f /usr/local/bin/pydoc*
-
-# Install correct python version
-PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg"
-AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg"
-SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09"
-DestDir="/"
-
-InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
-
-/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
-
-echo "export PATH=/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" >> ~/.bash_profile
-echo "python2 = 2.7.14" >> ~/versions.txt

coin/provisioning/qtci-osx-10.8-x86_64/02-disable-ntp.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-source "${BASH_SOURCE%/*}/../common/unix/disable-ntp_macos.sh"

coin/provisioning/qtci-osx-10.8-x86_64/025-python3.sh

@@ -1 +1 @@
-source "${BASH_SOURCE%/*}/../common/macos/python3.sh"
+source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-osx-10.9-x86_64/001-system_updates.sh

@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 BASEDIR=$(dirname "$0")
-$BASEDIR/../common/macos/system_updates.sh
+$BASEDIR/../common/system_updates.sh