Provisioning: Install Devtoolset-4 to Rhel 7.4

Gcc need to be downgraded from 6 to 5, because Gcc 6 is too new for
the latest Ubuntu LTS (16.04). This means Devtoolset-4 need to be used
instead of Devtoolset-6.

Task-number: QTBUG-64820
Change-Id: I2601aaaff5f3bbbadd867105fd4155239ab89825
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9
+	branch = 5.10.0
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9
+	branch = 5.10.0
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,101 +211,108 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
+	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.9
+	branch = 5.10.0
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.9
-	status = preview
+	branch = 5.10.0
+	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
-	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.9
-	status = preview
+	branch = 5.10.0
+	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.9
+	branch = 5.10.0
+	status = preview
+[submodule "qtwebglplugin"]
+	depends = qtbase qtwebsockets
+	recommends = qtdeclarative
+	path = qtwebglplugin
+	url = ../qtwebglplugin.git
+	branch = 5.10.0
 	status = preview

coin/platform_configs/default.txt

@@ -1,14 +1,14 @@
 Template                            Target OS           Target arch Compiler    Features
 ----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
 qtci-windows-8.1-x86_64                                             MSVC2013    DeveloperBuild Release DisableTests
-qtci-windows-10-x86_64-10                                           MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
+qtci-windows-10-x86_64-10                                            MSVC2015    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-3                                                Mingw53     DeveloperBuild Release OpenGLDynamic
-qtci-windows-10-x86_64-10                               x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10                                           MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10           WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10           WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
+qtci-windows-10-x86_64-10                                x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                            MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10            WinRT_10            x86         MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10            WinRT_10            armv7       MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
 qtci-linux-openSUSE-42.3-x86_64                                     GCC         DeveloperBuild NoPch
 qtci-linux-openSUSE-42.3-x86_64                                     ICC_18      DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-6.6-x86_64                                          GCC         Release ForceDebugInfo
@@ -18,8 +18,7 @@ qtci-osx-10.11-x86_64-3                                             Clang
 qtci-osx-10.10-x86_64                                               Clang       Release NoFramework DisableTests
 qtci-macos-10.12-x86_64-8           IOS_ANY             x86_64      Clang       Release DisableTests Static
 qtci-linux-RHEL-7.4-x86_64          Android_ANY         armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                armv7       GCC         Release
-qtci-linux-Ubuntu-16.04-x86_64-2    QEMU                arm64       GCC         Release
-qtci-linux-Ubuntu-16.04-x86_64-2                                    GCC         TestOnly LicenseCheck
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                armv7       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1    QEMU                arm64       GCC         Release
+qtci-linux-Ubuntu-16.04-x86_64-1                                    GCC         TestOnly LicenseCheck
 qtci-linux-RHEL-6.6-x86_64          QNX_660             armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-linux-RHEL-7.4-x86_64          INTEGRITY_11_04     armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qt5.txt

@@ -1,14 +1,14 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-8.1-x86_64                         x86         MSVC2013    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                         x86         MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-8.1-x86_64                                     MSVC2013    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10                                   MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
-qtci-windows-10-x86_64-10   WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86-6                                       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10                                    MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
+qtci-windows-10-x86_64-10    WinRT_10            x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-10   WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-10-x86_64-10   WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10            armv7       MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86_64-10    WinRT_10                        MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
 qtci-linux-RHEL-7.4-x86_64  Android_ANY         x86         GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-windows-7-x86-3        Android_ANY         armv7       Mingw53     Packaging Release DisableTests OpenGLES2
 qtci-windows-7-x86-3        Android_ANY         x86         Mingw53     Packaging Release DisableTests OpenGLES2
@@ -16,9 +16,12 @@ qtci-macos-10.12-x86_64-8   Android_ANY         armv7       GCC         Packagin
 qtci-macos-10.12-x86_64-8   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-macos-10.12-x86_64-8   IOS_ANY             multi       Clang       Packaging DebugAndRelease DisableTests Static
-qtci-windows-10-x86_64-10   QNX_700             armv7       Mingw53     Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   QNX_700             x86         Mingw53     Release DisableTests OpenGLES2
-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
+qtci-macos-10.12-x86_64-8   TvOS_ANY            multi       Clang       DebugAndRelease DisableTests
+qtci-macos-10.12-x86_64-8   WatchOS_ANY         multi       Clang       DebugAndRelease DisableTests
+qtci-windows-10-x86_64-10    QNX_700             armv7       Mingw53     Release DisableTests OpenGLES2
+qtci-windows-10-x86_64-10    QNX_700             x86         Mingw53     Release DisableTests OpenGLES2
+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
 qtci-linux-RHEL-7.4-x86_64  QNX_700             x86         GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
 qtci-linux-RHEL-7.4-x86_64  QNX_700             armv7       GCC         Release DisableTests OpenGLES2 NoUseGoldLinker
+qtci-linux-RHEL-7.4-x86_64  INTEGRITY_11_04     armv7       GCC         Packaging Release DisableTests OpenGLES2 NoUseGoldLinker

coin/platform_configs/qtbase.txt

@@ -1,4 +0,0 @@
-Template                          Target OS           Target arch Compiler    Features
---------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild DisableTests
-qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild DisableTests

coin/platform_configs/qtdeclarative.txt

@@ -1,4 +1,4 @@
 Template                          Target OS           Target arch Compiler    Features
 --------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild
-qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                arm64       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild

coin/platform_configs/qtwebkit.txt

@@ -1,5 +1,5 @@
 Template                    Target OS           Target arch Compiler    Features
 --------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                       x86         MSVC2017    DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-10-x86_64-10                       x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-10-x86_64-10                                   MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
 qtci-windows-7-x86-3                                        Mingw53     Packaging DebugAndRelease Release OpenGLDynamic DisableTests

coin/provisioning/common/DownloadURL.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -40,22 +40,51 @@
 # If called directly from another script, it will exit the parent script
 # as well, if not called in its own subshell with parentheses.
 
+# shellcheck source=try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+
+ExceptionDownloadPrimaryUrl=100
+ExceptionDownloadAltUrl=101
+ExceptionSHA1=102
+
 function DownloadURL {
     url=$1
     url_alt=$2
     expectedSha1=$3
     targetFile=$4
 
-    echo "Downloading from primary URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" ||  (
-        echo "Failed to download '$url' multiple times"
-        echo "Downloading from alternative URL '$url_alt'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
+    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 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
+                ;;
+            esac
+        }
+        echo "Checking SHA1 on PKG '$targetFile'"
+        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+        shasum --check $targetFile.sha1 || throw $ExceptionSHA1
     )
 
-    echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > $targetFile.sha1
-    sha1sum --check $targetFile.sha1
-    rm -f $targetFile.sha1
+    catch || {
+        case $ex_code in
+            $ExceptionDownloadAltUrl)
+                echo "Failed downloading PKG from primary and alternative URLs"
+                exit 1;
+            ;;
+            $ExceptionSHA1)
+                echo "Failed checksum on $targetFile."
+                exit 1;
+            ;;
+        esac
+    }
 }
 

coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh

@@ -0,0 +1,136 @@
+#!/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=try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=DownloadURL.sh
+source "${BASH_SOURCE%/*}/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/InstallFromCompressedFileFromURL.sh

@@ -0,0 +1,124 @@
+#!/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$
+##
+#############################################################################
+
+# shellcheck source=try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+# shellcheck source=DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+
+ExceptionDownload=99
+ExceptionCreateTmpFile=100
+ExceptionCreateTmpDirectory=101
+ExceptionUncompress=102
+ExceptionMoveApp=103
+ExceptionDeleteTmpFile=104
+ExceptionRemoveTmpDirectory=105
+ExceptionUnknownFormat=106
+
+
+function InstallFromCompressedFileFromURL {
+    url=$1
+    url_alt=$2
+    expectedSha1=$3
+    installDirectory=$4
+    appPrefix=$5
+
+    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)XXXXX.$extension") || throw $ExceptionCreateTmpFile
+        targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory
+        (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 $installDirectory"
+        sudo mkdir -p "$installDirectory"
+        sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || 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 location."
+                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/InstallPKGFromURL.sh

@@ -0,0 +1,104 @@
+#!/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$
+##
+#############################################################################
+
+# shellcheck source=try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+
+ExceptionCreateTmpFile=100
+ExceptionDownloadPrimaryUrl=101
+ExceptionDownloadAltUrl=102
+ExceptionSHA1=103
+ExceptionInstallerPKG=104
+ExceptionDeleteTmpFile=105
+
+
+function InstallPKGFromURL {
+    url=$1
+    url_alt=$2
+    expectedSha1=$3
+    targetDirectory=$4
+
+    try
+    (
+        echo "Creating temporary file"
+        targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg") || trow $ExceptionCreateTmpFile
+        try
+        (
+            echo "Downloading PKG 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 PKG from alternative URL '$url_alt'"
+                    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl
+                ;;
+            esac
+        }
+        echo "Checking SHA1 on PKG '$targetFile'"
+        echo "$expectedSha1 *$targetFile" > $targetFile.sha1
+        /usr/bin/shasum --check $targetFile.sha1 || throw $ExceptionSHA1
+        echo "Run installer on PKG"
+        sudo installer -package "$targetFile" -target "$targetDirectory" || throw $ExceptionInstallerPKG
+        echo "Removing file '$targetFile'"
+        rm "$targetFile" || throw $ExceptionDeleteTmpFile
+    )
+
+    catch || {
+        case $ex_code in
+            $ExceptionCreateTmpFile)
+                echo "Failed to create temporary file"
+                exit 1;
+            ;;
+            $ExceptionDownloadAltUrl)
+                echo "Failed downloading PKG from primary and alternative URLs"
+                exit 1;
+            ;;
+            $ExceptionSHA1)
+                echo "Failed to check sha1sum."
+                exit 1;
+            ;;
+            $ExceptionInstallerPKG)
+                echo "Failed running installer on PKG."
+                exit 1;
+            ;;
+            $ExceptionDeleteTmpFile)
+                echo "Failed deleting temporary file."
+                exit 1;
+            ;;
+        esac
+    }
+}

coin/provisioning/common/android_linux.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -37,9 +37,8 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
@@ -61,37 +60,65 @@ toolsSourceFile="$basePath/$toolsFile"
 ndkTargetFile="/tmp/$ndkFile"
 ndkSourceFile="$basePath/$ndkFile"
 
-DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile"
-DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile"
-echo "Unzipping Android NDK to '$targetFolder'"
-sudo unzip -q "$ndkTargetFile" -d "$targetFolder"
-echo "Unzipping Android Tools to '$sdkTargetFolder'"
-sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder"
-rm "$ndkTargetFile"
-rm "$toolsTargetFile"
+ExceptionDownload=99
+ExceptionUnzipTools=100
+ExceptionUnzipNdk=101
+ExceptionRmTools=102
+ExceptionRmNdk=103
+ExceptionSdkManager=104
 
-echo "Changing ownership of Android files."
-if uname -a |grep -q "el6\|el7"; then
+try
+(
+    (DownloadURL "$toolsSourceFile" "$toolsSourceFile" "$toolsSha1" "$toolsTargetFile") || throw $ExceptionDownload
+    (DownloadURL "$ndkSourceFile" "$ndkSourceFile" "$ndkSha1" "$ndkTargetFile") || throw $ExceptionDownload
+    echo "Unzipping Android NDK to '$targetFolder'"
+    sudo unzip -q "$ndkTargetFile" -d "$targetFolder" || throw $ExceptionUnzipNdk
+    echo "Unzipping Android Tools to '$sdkTargetFolder'"
+    sudo unzip -q "$toolsTargetFile" -d "$sdkTargetFolder" || throw $ExceptionUnzipTools
+    rm "$ndkTargetFile" || throw $ExceptionRmNdk
+    rm "$toolsTargetFile" || throw $ExceptionRmTools
+
+    echo "Changing ownership of Android files."
     sudo chown -R qt:wheel "$targetFolder"
-else
-    sudo chown -R qt:users "$targetFolder"
-fi
 
-echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
-if [ "$http_proxy" != "" ]; then
-    proxy_host=$(echo $proxy | cut -d'/' -f3 | cut -d':' -f1)
-    proxy_port=$(echo $proxy | cut -d':' -f3)
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host=$proxy_host --proxy_port=$proxy_port "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
-else
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion"
-fi
+    echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion."
+    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
 
-SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder"
-SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion"
-SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64"
-SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel"
+    echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc
+    echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc
+    echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc
+
+    echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
+    echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
+    echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
+    echo "Android NDK = $ndkVersion" >> ~/versions.txt
+)
+catch || {
+        case $ex_code in
+            $ExceptionDownload)
+                exit 1;
+            ;;
+            $ExceptionUnzipTools)
+                echo "Failed to unzip Android SDK Tools."
+                exit 1;
+            ;;
+            $ExceptionUnzipNdk)
+                echo "Failed to unzip Android NDK."
+                exit 1;
+            ;;
+            $ExceptionRmTools)
+                echo "Failed to remove temporary tools package '$toolsTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionRmNdk)
+                echo "Failed to remove temporary NDK package '$ndkTargetFile'."
+                exit 1;
+            ;;
+            $ExceptionSdkManager)
+                echo "Failed to run sdkmanager."
+                exit 1;
+            ;;
+        esac
+}
 
-echo "Android SDK tools = $toolsVersion" >> ~/versions.txt
-echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt
-echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt
-echo "Android NDK = $ndkVersion" >> ~/versions.txt

coin/provisioning/common/cmake.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -39,8 +39,6 @@
 
 # shellcheck source=./InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.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"
@@ -49,6 +47,5 @@ appPrefix="cmake-3.6.2-Darwin-x86_64"
 
 InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
 
-SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH"
-
+echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc
 echo "CMake = 3.6.2" >> ~/versions.txt

coin/provisioning/common/cmake_linux.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -37,8 +37,8 @@
 
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/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"
@@ -49,4 +49,5 @@ appPrefix="cmake-$version-Linux-x86_64"
 
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
-SetEnvVar "PATH" "$targetFolder/bin:\$PATH"
+echo "Adding $targetFolder/bin to PATH"
+echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc

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

@@ -1,6 +1,4 @@
-#!/usr/bin/env bash
-
-#############################################################################
+############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
@@ -33,6 +31,7 @@
 ##
 #############################################################################
 
-set -ex
+# This script disables the automatic Windows updates
 
-source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh"
+stop-service wuauserv
+set-service wuauserv –startup disabled

coin/provisioning/common/fbx_linux.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -34,8 +34,8 @@
 #############################################################################
 
 # This script installs FBX SDK
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+#s script installs FBX SDK
 
 set -e
 tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
@@ -56,7 +56,7 @@ sudo mkdir -p $targetFolder
 rm -rf "$targetFile"
 
 # Set env variables
-SetEnvVar "FBXSDK" "$targetFolder"
+echo "export FBXSDK=$targetFolder" >> ~/.profile
 
 echo "FBX SDK = 2016.1.2" >> ~/versions.txt
 

coin/provisioning/common/fbx_macos.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -34,10 +34,8 @@
 
 # This script installs FBX SDK
 
-set -ex
-
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+# shellcheck source=./try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
 
 fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
 targetFolder="/opt/fbx"
@@ -50,24 +48,32 @@ installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
 
 ExceptionExtractPrimaryUrl=100
 
-echo "Extracting '$cachedUrl'"
-tar -xzf "$cachedUrl" -C "$targetFolder" || (
-    echo "Failed to uncompress from '$cachedUrl'"
-    echo "Downloading from '$officialUrl'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl"
-    echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$sha1 *$targetFile" > $targetFile.sha1
-    shasum --check $targetFile.sha1
-    echo "Extracting '$targetFile'"
-    tar -xzf "$targetFile" -C "$targetFolder"
+try
+(
+    echo "Extracting '$cachedUrl'"
+    tar -xzf "$cachedUrl" -C "$targetFolder" || throw $ExceptionExtractPrimaryUrl
 )
-
+catch || {
+    case $ex_code in
+        $ExceptionExtractPrimaryUrl)
+        set -e
+        echo "Failed to uncompress from '$cachedUrl'"
+        echo "Downloading from '$officialUrl'"
+        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$officialUrl" || exit 1;
+        echo "Checking SHA1 on PKG '$targetFile'"
+        echo "$sha1 *$targetFile" > $targetFile.sha1
+        shasum --check $targetFile.sha1
+        echo "Extracting '$targetFile'"
+        tar -xzf "$targetFile" -C "$targetFolder" || exit 1;
+        ;;
+    esac
+}
+set -e
 rm -rf "$targetFile"
 echo "Running installer for '$installer'"
 sudo installer -pkg "$installer" -target "/"
 
 # Set env variables
-SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/"
-
+echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc
 echo "FBX SDK = 2016.1.2" >> ~/versions.txt
 

coin/provisioning/common/helpers.ps1

@@ -127,27 +127,3 @@ function is64bitWinHost
         return 0
     }
 }
-
-Function Execute-Command
-{
-    Param (
-       [string]$command
-    )
-    Try {
-        echo "Executing command '$command'..."
-        $process = Start-Process -FilePath "cmd" -ArgumentList "/c $command" -PassThru -Wait -WindowStyle Hidden
-        if ($process.ExitCode) {throw "Error running command: '$command'"}
-    }
-    Catch {
-        $_.Exception.Message
-        exit 1
-    }
-}
-
-function isProxyEnabled {
-    return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyEnable
-}
-
-function getProxy {
-    return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer
-}

coin/provisioning/common/icu.ps1

@@ -39,12 +39,29 @@ $version = "53_1"
 
 if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) {
 
+   $url_official_2012 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_64_devel.7z"
+   $url_cache_2012 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_64_devel.7z"
+   $sha1_2012 = "8A8C371F3ED58E81BBCF58CF5F8388CEF51FA9AC"
+
    $url_official_2013 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_64_devel.7z"
    $url_cache_2013 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_64_devel.7z"
    $sha1_2013 = "7267CF8C5BD39C4218F2CCFE31ECA81B7644ED6F"
 
+   $icuPackage_msvc2012_64 = "C:\Windows\Temp\icu-$version-msvc2012_64.7z"
    $icuPackage_msvc2013_64 = "C:\Windows\Temp\icu-$version-msvc2013_64.7z"
 
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_64_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2012 $url_cache_2012 $icuPackage_msvc2012_64
+      Verify-Checksum $icuPackage_msvc2012_64 $sha1_2012
+      Get-ChildItem $icuPackage_msvc2012_64 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_64_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2012_64..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2012_64
+
+      echo "ICU MSVC2012 = $version" >> ~\versions.txt
+   }
+
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_64_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013 $url_cache_2013 $icuPackage_msvc2013_64
@@ -58,6 +75,7 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine")
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine")
 
 # FIXME: do we really want to use the 4.8.2 ICU build?
@@ -65,12 +83,29 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
 
 } else {
 
+   $url_official_2012_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2012/icu_" + $version + "_msvc_2012_32_devel.7z"
+   $url_cache_2012_32 = "\\ci-files01-hki.intra.qt.io\provisioning\windows\icu_" + $version + "_msvc_2012_32_devel.7z"
+   $sha1_2012_32 = "F2FF287EEB0163B015D37AE08871165FBA87BCF0"
+
    $url_official_2013_32 = "http://download.qt.io/development_releases/prebuilt/icu/prebuilt/msvc2013/icu_" + $version + "_msvc_2013_32_devel.7z"
    $url_cache_2013_32 = "\\ci-files01-hki.intra.qt.io/provisioning/windows/icu_" + $version + "_msvc_2013_32_devel.7z"
    $sha1_2013_32 = "D745A5F0F6A3817AE989501A01A5A0BA53FDB800"
 
+   $icuPackage_msvc2012_32 = "C:\Windows\Temp\icu-$version-msvc2012_32.7z"
    $icuPackage_msvc2013_32 = "C:\Windows\Temp\icu-$version-msvc2013_32.7z"
 
+   if (!(Test-Path C:\Utils\icu_"$version"_msvc_2012_32_devel\)) {
+      echo "Fetching from URL ..."
+      Download $url_official_2012_32 $url_cache_2012_32 $icuPackage_msvc2012_32
+      Verify-Checksum $icuPackage_msvc2012_32 $sha1_2012_32
+      Get-ChildItem $icuPackage_msvc2012_32 | % {& "C:\Utils\sevenzip\7z.exe" "x" $_.fullname -o""C:\Utils\icu_"$version"_msvc_2012_32_devel\""}
+
+      echo "Cleaning $icuPackage_msvc2012_32..."
+      Remove-Item -Recurse -Force $icuPackage_msvc2012_32
+
+      echo "ICU MSVC2012 = $version" >> ~\versions.txt
+   }
+
    if (!(Test-Path C:\Utils\icu_"$version"_msvc_2013_32_devel\)) {
       echo "Fetching from URL ..."
       Download $url_official_2013_32 $url_cache_2013_32 $icuPackage_msvc2013_32
@@ -84,6 +119,7 @@ if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -e
    }
 
 # FIXME: do we really want to have it per MSVC version? What about MSVC2015?
+[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_32_devel\\icu53_1", "Machine")
 [Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_32_devel\\icu53_1", "Machine")
 
 }

coin/provisioning/common/install-commandlinetools.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -32,48 +32,57 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/try_catch.sh"
 set -ex
 
-# shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# Command line tools is need by homebrew
+
+function InstallCommandLineTools {
+
+    ExceptionMount=101
+    ExceptionInstall=102
+    ExceptionUnmount=103
 
-function InstallFromCompressedFileFromURL {
     url=$1
     url_alt=$2
     expectedSha1=$3
-    installDirectory=$4
-    appPrefix=$5
+    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 mount"
+                exit 1;
+            ;;
+            $ExceptionUnmount)
+                echo "Failed to mount"
+                exit 1;
+
+        esac
+    }
 
-    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)XXXXX.$extension")
-    targetDirectory=$(mktemp -d)
-    DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile"
-    echo "Uncompress $targetFile"
-    case $extension in
-        "tar.gz")
-            tar -xzf "$targetFile" --directory "$targetDirectory"
-        ;;
-        "zip")
-            unzip "$targetFile" -d "$targetDirectory"
-        ;;
-        *)
-            exit 1
-        ;;
-    esac
-    echo "Moving app to $installDirectory"
-    sudo mkdir -p "$installDirectory"
-    sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory"
-    echo "Removing file '$targetFile'"
-    rm "$targetFile"
-    echo "Removing directory '$targetDirectory'"
-    rm -rf "$targetDirectory"
 }
-

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-jdk.ps1

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

coin/provisioning/common/install-mingw.ps1

@@ -31,7 +31,7 @@
 ##
 ############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 function InstallMinGW
 {

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-ruby.ps1

@@ -31,28 +31,30 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # This script will install Ruby
 
-$version = "2.4.2-2"
+$version = "2.2.6"
 if( (is64bitWinHost) -eq 1 ) {
     $arch = "-x64"
-    $sha1 = "c961c2752a183487bc42ed24beb7e931230fa7d5"
+    $sha1 = "4D0E366F0264CDED174E5842B2435E22B81FB57A"
 }
 else {
-    $arch = "-x86"
-    $sha1 = "2639a481c3b5ad11f57d5523cc41ca884286089e"
+    $arch = ""
+    $sha1 = "8649309fffe9c746ad5549d3f7b70490806e95df"
 }
 $url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\rubyinstaller-" + $version + $arch + ".exe"
-$url_official = "https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-" + $version + "/rubyinstaller-" + $version + $arch + ".exe"
+$url_official = "https://bintray.com/oneclick/rubyinstaller/download_file?file_path=rubyinstaller-" + $version + $arch + ".exe"
 $rubyPackage = "C:\Windows\Temp\rubyinstaller-$version.exe"
 
 Download $url_official $url_cache $rubyPackage
 Verify-Checksum $rubyPackage $sha1
-Start-Process -FilePath $rubyPackage -ArgumentList "/dir=C:\Ruby-$version$arch /tasks=modpath /verysilent" -Wait
+cmd /c "$rubyPackage /silent"
 
 echo "Cleaning $rubyPackage.."
 Remove-Item -Recurse -Force "$rubyPackage"
 
+Add-Path "C:\Ruby22-x64\bin"
+
 echo "Ruby = $version" >> ~\versions.txt

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/install_xcode.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -44,18 +44,48 @@
 
 
 
-function InstallXCode() {
+# shellcheck source=../common/try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+
+function InstallXCode()
+{
+    ExceptionCPIO=103
+    ExceptionAcceptLicense=105
+    ExceptionDeveloperMode=113
+
     sourceFile=$1
     version=$2
 
-    echo "Uncompressing and installing '$sourceFile'"
-    xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi)
+    try
+    (
+        echo "Uncompressing and installing '$sourceFile'"
+        xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) || throw $ExceptionCPIO
 
-    echo "Accept license"
-    sudo xcodebuild -license accept
+        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
+        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
+    }
 
-    echo "Xcode = $version" >> ~/versions.txt
 }
+

coin/provisioning/common/integrity.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -35,8 +35,7 @@
 
 # This script installs INTEGRITY
 
-source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
 
 version="11.4.4"
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz"
@@ -47,10 +46,10 @@ appPrefix=""
 
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
-SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9"
-SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654"
-SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144"
-SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc"
-SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante"
+echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc
+echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc
+echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc
+echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc
+echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc
 
 echo "INTEGRITY = $version" >> ~/versions.txt

coin/provisioning/common/libclang.ps1

@@ -1,10 +1,10 @@
 param([Int32]$archVer=32)
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\helpers.ps1"
 
 # 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.
 
-Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object {
+Get-Content "$PSScriptRoot\..\common\sw_versions.txt" | Foreach-Object {
     $var = $_.Split('=')
     New-Variable -Name $var[0] -Value $var[1]
     $libclang_version = $libclang_version -replace '["."]'

coin/provisioning/common/libclang.sh

@@ -40,10 +40,8 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
-source "${BASH_SOURCE%/*}/check_and_set_proxy.sh"
-
 BASEDIR=$(dirname "$0")
-. $BASEDIR/../shared/sw_versions.txt
+. $BASEDIR/sw_versions.txt
 url=$1
 sha1=$2
 version=$3
@@ -60,7 +58,12 @@ zip="libclang.7z"
 destination="/usr/local/libclang-$version"
 
 curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url"
-echo "$sha1  $zip" | sha1sum --check
+_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
 

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,91 +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$
-##
-#############################################################################
-
-# 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.
-
-set -ex
-
-# shellcheck source=DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-
-function InstallAppFromCompressedFileFromURL {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    appPrefix=$4
-    target=$5
-
-    if [ "" == "$target" ]; then
-        target="/Applications/"
-    fi
-
-    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")
-    # macOS 10.10 mktemp does require prefix
-    if [[ $OSTYPE == "darwin14" ]]; then
-        targetDirectory=$(mktemp -d -t '10.10')
-    else
-        targetDirectory=$(mktemp -d)
-    fi
-    (DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile")
-    echo "Uncompress $targetFile"
-    case $extension in
-        "tar.gz")
-            tar -xzf "$targetFile" --directory "$targetDirectory"
-        ;;
-        "zip")
-            unzip -q "$targetFile" -d "$targetDirectory"
-        ;;
-        *)
-            exit 1
-        ;;
-    esac
-    echo "Moving app to '$target'"
-    sudo mv "$targetDirectory/$appPrefix/"* "$target"
-    echo "Removing file '$targetFile'"
-    rm "$targetFile"
-    echo "Removing directory '$targetDirectory'"
-    rm -rf "$targetDirectory"
-}

coin/provisioning/common/macos/InstallPKGFromURL.sh

@@ -1,59 +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$
-##
-#############################################################################
-
-set -ex
-
-function InstallPKGFromURL {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    targetDirectory=$4
-
-    echo "Creating temporary file"
-    targetFile=$(mktemp "$TMPDIR$(uuidgen).pkg")
-    echo "Downloading PKG from primary URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || (
-        echo "Failed to download '$url' multiple times"
-        echo "Downloading PKG from alternative URL '$url_alt'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
-    )
-    echo "Checking SHA1 on PKG '$targetFile'"
-    echo "$expectedSha1 *$targetFile" > $targetFile.sha1
-    /usr/bin/shasum --check $targetFile.sha1
-    echo "Run installer on PKG"
-    sudo installer -package "$targetFile" -target "$targetDirectory"
-    echo "Removing file '$targetFile'"
-    rm "$targetFile"
-}

coin/provisioning/common/macos/disable_update_downloads.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-sudo defaults write /Library/Preferences/com.apple.SoftwareUpdate AutomaticDownload -boolean FALSE
-

coin/provisioning/common/macos/pip.sh

@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-function InstallPip {
-
-    python=$1
-
-    # Will install pip utility for python
-    curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
-    sudo "$python" get-pip.py
-    rm get-pip.py
-}

coin/provisioning/common/macos/python2.sh

@@ -1,59 +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$
-##
-#############################################################################
-
-# This script installs python2
-
-# shellcheck source=./InstallPKGFromURL.sh
-source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=./../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-# shellcheck source=./pip.sh
-source "${BASH_SOURCE%/*}/pip.sh"
-
-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"
-
-InstallPip /Library/Frameworks/Python.framework/Versions/2.7/bin/python
-
-/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv
-
-SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH"
-
-echo "python2 = 2.7.14" >> ~/versions.txt
-

coin/provisioning/common/macos/sha1sum-compatibility.sh

@@ -1,49 +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$
-##
-#############################################################################
-
-# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'.
-# In order to make all unix provioning scripts run on macOS without special case handling
-# a symbolic link is created.
-# The shasum tool is a perl script which does some globbing to determine the perl version. The
-# symbolic link has to point directly to the binary including the perl version.
-# Additionally the CI seems to have multiple parallel perl versions installed which causes
-# multiple shasum tools to be present (shasum5.16, shasum5.18).
-#
-# Currently this is
-#     /usr/local/bin/sha1sum -> /usr/bin/shasum5.18
-
-[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin
-SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1)
-sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum

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"
@@ -55,7 +55,7 @@ function Extract-Mesa
 }
 
 if ( Test-Path C:\Windows\SysWOW64 ) {
-    Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32"
+    Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative"
     Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64"
 } else {
     Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32"

coin/provisioning/common/mqtt_broker.ps1

@@ -1,5 +1,3 @@
-#!/usr/bin/env bash
-
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -33,19 +31,20 @@
 ##
 #############################################################################
 
-# A helper script used for setting environment variables on Unix systems
+. "$PSScriptRoot\helpers.ps1"
 
-set -ex
+echo "MQTT: Downloading Paho test broker..."
+$zip = "c:\users\qt\downloads\pahotest.zip"
+$externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
+$internalUrl = "http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0.zip"
+$sha1 = "532fe145096cdd8d679f425cbfd883289150c968"
 
-function SetEnvVar {
-    name=$1
-    path=$2
+Download $externalUrl $internalUrl $zip
+Verify-Checksum $zip $sha1
 
-    echo "Setting environment variable $name to $path."
+echo "MQTT: Installing $zip..."
+Extract-Zip $zip C:\Utils
+Remove-Item $zip
 
-    if uname -a |grep -q "Ubuntu"; then
-        echo "export $name=$path" >> ~/.profile
-    else
-        echo "export $name=$path" >> ~/.bashrc
-    fi
-}
+echo "MQTT: Updating environment..."
+[Environment]::SetEnvironmentVariable("MQTT_TEST_BROKER_LOCATION", "C:\Utils\paho.mqtt.testing-c342c09dadc7a664d0a8befad1ca031f5a0b0bc0\interoperability\startbroker.py", "Machine")

coin/provisioning/common/mqtt_broker.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -32,31 +32,21 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-set -ex
 
-# Command line tools is need by homebrew
+# This script installs paho testing broker
 
-function InstallCommandLineTools {
-    url=$1
-    url_alt=$2
-    expectedSha1=$3
-    packageName=$4
-    version=$5
+# shellcheck source=../common/InstallFromCompressedFileFromURL.sh
+source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh"
 
-    DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
-    echo "Mounting $packageName"
-    hdiutil attach /tmp/$packageName
-    cd "/Volumes/Command Line Developer Tools"
-    echo "Installing"
-    sudo installer -verbose -pkg *.pkg -target /
-    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/
-    echo "Removing $packageName"
-    rm /tmp/$packageName
+CommitSHA="c342c09dadc7a664d0a8befad1ca031f5a0b0bc0"
+PrimaryUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip"
+AltUrl="http://ci-files01-hki.ci.local/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip"
+SHA1="532fe145096cdd8d679f425cbfd883289150c968"
+targetFolder="/opt/paho_broker"
+appPrefix="paho.mqtt.testing-$CommitSHA"
 
-    echo "Command Line Tools = $version" >> ~/versions.txt
-}
+sudo rm -fr "$targetFolder"
+InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
+
+echo "Adding MQTT broker path to environment"
+sed -i "1iexport MQTT_TEST_BROKER_LOCATION=$targetFolder/interoperability/startbroker.py" ~/.bashrc

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/openssl_for_android_linux.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/env bash
 
 #############################################################################
 ##
@@ -36,8 +36,8 @@
 # This script install OpenSSL from sources.
 # Requires GCC and Perl to be in PATH.
 
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
 
 version="1.0.2g"
 officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
@@ -50,16 +50,36 @@ sha="36af23887402a5ea4ebef91df8e61654906f58f2"
 # QTQAINFRA-1436
 opensslHome="${installFolder}openssl-1.0.2"
 
-DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
+ExceptionDownload=99
+ExceptionTar=100
+ExceptionConfig=101
 
-tar -xzf "$targetFile" -C "$installFolder"
-# This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
-mv "${opensslHome}g" "${opensslHome}"
-pushd "$opensslHome"
+try
+(
+    (DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile") || throw $ExceptionDownload
 
-echo "Running configure"
-perl Configure shared android
+    tar -xzf "$targetFile" -C "$installFolder" || throw $ExceptionTar
+    # This rename should be removed once hard coded path from Coin is fixed. (QTQAINFRA-1436)
+    mv "${opensslHome}g" "${opensslHome}"
+    pushd "$opensslHome"
+    perl Configure shared android || throw $ExceptionConfig
 
-SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
+    echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc
+    echo "OpenSSL for Android = $version" >> ~/versions.txt
+)
+catch || {
+    case $ex_code in
+        $ExceptionDownload)
+            exit 1;
+        ;;
+        $ExceptionTar)
+            echo "Failed to extract $targetFile"
+            exit 1;
+        ;;
+        $ExceptionConfig)
+            echo "Failed to run 'config'."
+            exit 1;
+        ;;
+    esac
 
-echo "OpenSSL for Android = $version" >> ~/versions.txt
+}

coin/provisioning/common/pip.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+# Will install pip utility for python
+curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py
+sudo python get-pip.py
+rm get-pip.py

coin/provisioning/common/python.ps1

@@ -63,8 +63,4 @@ Add-Path "C:\Python27;C:\Python27\Scripts"
 
 C:\Python27\python.exe -m ensurepip
 # Install python virtual env
-#if ( isProxyEnabled ) {
-#    echo "Using proxy with pip"
-#    $pip_args = "--proxy=" + (getProxy)
-#}
 C:\Python27\Scripts\pip.exe install virtualenv

coin/provisioning/common/python3.ps1

@@ -67,8 +67,4 @@ del $package
 [Environment]::SetEnvironmentVariable("PIP3_PATH", "$install_path\Scripts", [EnvironmentVariableTarget]::Machine)
 
 # Install python virtual env
-#if ( isProxyEnabled ) {
-#    echo "Using proxy with pip"
-#    $pip_args = "--proxy=" + (getProxy)
-#}
 cmd /c "$install_path\Scripts\pip3.exe install virtualenv"

coin/provisioning/common/python3.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##
@@ -36,12 +36,7 @@
 
 # This script installs python3
 
-# shellcheck source=./InstallPKGFromURL.sh
 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh"
-# shellcheck source=./../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-# shellcheck source=./pip.sh
-source "${BASH_SOURCE%/*}/pip.sh"
 
 PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg"
 AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg"
@@ -50,12 +45,8 @@ DestDir="/"
 
 InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir"
 
-InstallPip /Library/Frameworks/Python.framework/Versions/3.6/bin/python3
-
 /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv
 
-SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
-SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin"
-
+echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc
+echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc
 echo "python3 = 3.6.1" >> ~/versions.txt
-

coin/provisioning/common/qnx_700.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/env bash
 
 #############################################################################
 ##
@@ -36,9 +36,6 @@
 # This script installs QNX 7.
 
 set -ex
-
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
 targetFolder="/opt/"
 sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz"
 sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113"
@@ -47,7 +44,7 @@ targetFile="qnx700.tar.xz"
 wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile"
 echo "$sha1  $targetFile" | sha1sum --check
 if [ ! -d "$targetFolder" ]; then
-    mkdir -p $targetFolder
+  mkdir -p $targetFolder
 fi
 sudo tar -C $targetFolder -Jxf $targetFile
 sudo chown -R qt:users "$targetFolder"/"$folderName"
@@ -60,6 +57,5 @@ fi
 
 rm -rf $targetFile
 # Set env variables
-SetEnvVar "QNX_700" "$targetFolder$folderName"
-
+echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc
 echo "QNX SDP = 7.0.0" >> ~/versions.txt

coin/provisioning/common/ruby.ps1

@@ -0,0 +1,7 @@
+. "$PSScriptRoot\helpers.ps1"
+
+$installer = "c:\users\qt\downloads\rubyinstaller-2.3.1.exe"
+
+Download https://dl.bintray.com/oneclick/rubyinstaller/rubyinstaller-2.3.1.exe http://ci-files01-hki.intra.qt.io/input/ruby/rubyinstaller-2.3.1.exe $installer
+Verify-Checksum $installer "FF377F6F313849C3B0CD72EEC1EFFA436F0E4A36"
+& $installer /DIR=C:\ruby /VERYSILENT

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/shared/http_proxy.txt

@@ -1,2 +0,0 @@
-proxy="http://proxy.intra.qt.io:3128"
-

coin/provisioning/common/system_updates.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 #############################################################################
 ##

coin/provisioning/common/try_catch.sh

@@ -1,4 +1,5 @@
-#!/usr/bin/env bash
+#!/bin/bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
@@ -32,8 +33,32 @@
 ##
 #############################################################################
 
-set -ex
+echo "Sourcing try_catch.sh"
 
-source "${BASH_SOURCE%/*}/../shared/http_proxy.txt"
+function try()
+{
+    [[ $- = *e* ]]; SAVED_OPT_E=$?
+    set +e
+}
 
-(wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io && echo "Setting http_proxy to $proxy" && export http_proxy=$proxy) || echo "Proxy not detected at $proxy"
+function throw()
+{
+    exit "$1"
+}
+
+function catch()
+{
+    export ex_code=$?
+    (( SAVED_OPT_E )) && set +e
+    return $ex_code
+}
+
+function throwErrors()
+{
+    set -e
+}
+
+function ignoreErrors()
+{
+    set +e
+}

coin/provisioning/common/unix/disable-ntp_macos.sh

@@ -1,40 +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)"
-echo "sudo launchctl unload /System/Library/LaunchDaemons/org.ntp.ntpd.plist" >> /Users/qt/.bash_profile
-

coin/provisioning/common/unix/squishInstall.sh

@@ -1,153 +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$
-##
-#############################################################################
-
-set -ex
-
-# This script will install squish package for Linux and Mac.
-# Squish is need by Release Test Automation (RTA)
-
-version="6.3.0"
-# Branch version without dot
-qtBranch="59x"
-squishFolder="/opt/squish"
-squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/"
-squishFile="squish-$version-qt$qtBranch-linux64.run"
-if uname -a |grep -q Darwin; then
-     squishFile="squish-$version-qt$qtBranch-macx86_64.dmg"
-fi
-
-squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/"
-squishLicenseFile=".squish-3-license.tar.gz"
-
-# These checks can be removed when Vanilla OS for all linux and Mac are in
-if [ -d "$squishFolder" ]; then
-    echo "Move old squish to /tmp"
-    sudo mv "$squishFolder" "/tmp/squish_$(date)"
-fi
-
-if [ -f "/etc/profile.d/squish_env.sh" ]; then
-    echo "Remove /etc/profile.d/squish_env.sh"
-    sudo rm -f "/etc/profile.d/squish_env.sh"
-    export SQUISH_LICENSEKEY_DIR=$HOME
-fi
-
-function MountAndInstall {
-    url=$1
-    targetDirectory=$2
-    targetFile=$3
-
-    # Check which platform
-    if uname -a |grep -q Darwin; then
-        usersGroup="staff"
-        mountFolder="/Volumes"
-        squishLicenseDir="/Users/qt"
-    elif uname -a |grep -q "el6\|el7"; then
-        usersGroup="qt"
-        mountFolder="/tmp"
-        squishLicenseDir="/root"
-    elif uname -a |grep -q "Ubuntu"; then
-        usersGroup="users"
-        mountFolder="/tmp"
-        squishLicenseDir="/home/qt"
-    else
-        usersGroup="users"
-        mountFolder="/tmp"
-        squishLicenseDir="/root"
-    fi
-
-    targetFileMount="$mountFolder"/"$targetFile"
-
-    echo "Mounting $url to $mountFolder"
-    sudo mount "$url" $mountFolder
-    echo "Create $targetDirectory if needed"
-    if [ !  -d "/opt" ]; then
-        sudo mkdir "/opt"
-    fi
-    if [ !  -d "$targetDirectory" ]; then
-        sudo mkdir "$targetDirectory"
-    fi
-    echo "Uncompress $targetFile"
-    if [[ $targetFile == *.tar.gz ]]; then
-        if [[ $targetFile == .squish-3-license.* ]]; then
-            target="$squishLicenseDir"
-            # Squish license need to be exists also in users home directory, because squish check it before it starts running tests
-            sudo tar -xzf "$targetFileMount" --directory "$HOME"
-        else
-            target="$targetDirectory"
-        fi
-        sudo tar -xzf "$targetFileMount" --directory "$target"
-        echo "Unmounting $mountFolder"
-        sudo umount $mountFolder
-    elif [[ $targetFile == *.dmg ]]; then
-        echo "'dmg-file', no need to uncompress"
-        sudo cp $targetFileMount /tmp
-        sudo umount $mountFolder
-        sudo hdiutil attach "/tmp/$targetFile"
-        sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory"
-        sudo hdiutil unmount /Volumes/froglogic\ Squish/
-    elif [[ $targetFile == *.run ]]; then
-        echo "'run-file', no need to uncompress"
-        sudo cp $targetFileMount $targetDirectory
-        sudo umount $mountFolder
-        sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1
-        sudo rm -fr "$targetDirectory/$targetFile"
-        if uname -a |grep -q "Ubuntu"; then
-            sudo mkdir /usr/lib/tcl8.6
-            sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/
-        fi
-    else
-        exit 1
-    fi
-
-    echo "Changing ownerships"
-    sudo chown -R qt:$usersGroup "$targetDirectory"
-    sudo chown qt:$usersGroup "$HOME/.squish-3-license"
-}
-
-echo "Set commands for environment variables in .bashrc"
-
-if uname -a |grep -q "Ubuntu"; then
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile
-    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile
-else
-    echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc
-    echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc
-fi
-
-echo "Installing squish license to home directory.."
-MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile"
-
-echo "Installing squish $version.."
-MountAndInstall "$squishUrl" "$squishFolder" "$squishFile"