Revert "Add 'ForceDebugInfo' -flag to linux desktop binaries"

Now debug symbols are added in qtlibs as well and library size
is huge. We need additional 'separate_debug_info' flag in
addition to this but currently there isn't support for it in
coin. That's why we need to revert this change until coin has
full support for this.

This reverts commit b0b6b05b34.

Change-Id: I7d36d2778433d2034420c209b73d21b5af32249f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>

.gitmodules

@@ -1,66 +1,66 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
 	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -81,14 +81,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -121,27 +121,27 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtquick1"]
 	depends = qtscript
@@ -154,51 +154,51 @@
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = essential
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtenginio"]
 	depends = qtdeclarative
@@ -211,101 +211,101 @@
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtquickcontrols qtwebchannel
 	recommends = qtlocation qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtpurchasing"]
 	depends = qtbase qtandroidextras
 	recommends = qtdeclarative
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = preview
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	recommends = qtwebview
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.9.3
+	branch = 5.9.4
 	status = preview
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.9.3
+	branch = 5.9.4
 	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-1                                    GCC         NoWidgets ForceDebugInfo
-qtci-linux-Ubuntu-16.04-x86_64-1                                    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-2                                    GCC         NoWidgets ForceDebugInfo
+qtci-linux-Ubuntu-16.04-x86_64-2                                    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,7 +18,8 @@ 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-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-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-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    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
+qtci-windows-8.1-x86_64                         x86         MSVC2013    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-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-10-x86_64-10   WinRT_10                        MSVC2015    Packaging DebugAndRelease Release ForceDebugInfo DisableTests
+qtci-windows-10-x86-6                                       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-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,10 +16,9 @@ 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-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

@@ -0,0 +1,4 @@
+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-1  QEMU                armv7       GCC         DeveloperBuild
-qtci-linux-Ubuntu-16.04-x86_64-1  QEMU                arm64       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  QEMU                armv7       GCC         DeveloperBuild
+qtci-linux-Ubuntu-16.04-x86_64-2  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-7                        x86         MSVC2017    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
-qtci-windows-10-x86_64-7                                    MSVC2017    Packaging 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 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##

coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh

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

coin/provisioning/common/InstallFromCompressedFileFromURL.sh

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

coin/provisioning/common/InstallPKGFromURL.sh

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

coin/provisioning/common/android_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -39,6 +39,7 @@
 
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 targetFolder="/opt/android"
 sdkTargetFolder="$targetFolder/sdk"
@@ -79,10 +80,20 @@ try
     rm "$toolsTargetFile" || throw $ExceptionRmTools
 
     echo "Changing ownership of Android files."
-    sudo chown -R qt:wheel "$targetFolder"
+    if uname -a |grep -q "el6\|el7"; then
+        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."
-    echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    if [ "$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" || throw $ExceptionSdkManager
+    else
+        echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
+    fi
 
     echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc

coin/provisioning/common/check_and_set_proxy.sh

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env bash
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## 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.
@@ -32,18 +32,19 @@
 ##
 #############################################################################
 
-function RemoveDir {
-    param=$1
+source "${BASH_SOURCE%/*}/try_catch.sh"
+source "${BASH_SOURCE%/*}/http_proxy.txt"
 
-    if [ ! -d $param ]
-    then
-        echo "'$param' don't exists"
-    else
-        echo "Removing $param..."
-        sudo rm -fr $param
-    fi
-}
+try
+(
+  wget -q -e "http_proxy=$proxy" --spider proxy.intra.qt.io
+)
+
+if [ $? -eq 0 ]; then
+    echo "Setting http_proxy to $proxy"
+    export http_proxy=$proxy
+
+else
+    echo "Proxy not detected at $proxy"
+fi
 
-# Remove Android
-param="/opt/android"
-RemoveDir $param

coin/provisioning/common/cmake.sh

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

coin/provisioning/common/cmake_linux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -50,4 +50,8 @@ appPrefix="cmake-$version-Linux-x86_64"
 InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix"
 
 echo "Adding $targetFolder/bin to PATH"
-echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+if uname -a |grep -q "Ubuntu"; then
+    echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile
+else
+    echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc
+fi

coin/provisioning/common/fbx_linux.sh

@@ -0,0 +1,62 @@
+#!/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 installs FBX SDK
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+#s script installs FBX SDK
+
+set -e
+tarballName="fbx20161_2_fbxsdk_linux.tar.gz"
+targetFolder="/opt/fbx"
+cachedUrl="http://ci-files01-hki.intra.qt.io/input/fbx/$tarballName"
+officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$tarballName"
+sha1="b0a08778de025e2c6e90d6fbdb6531f74a3da605"
+tmpFolder="/tmp"
+targetFile="$tmpFolder/$tarballName"
+installer="$tmpFolder/fbx20161_2_fbxsdk_linux"
+
+DownloadURL "$cachedUrl" "$officialUrl" "$sha1" "$targetFile"
+
+sudo tar -C $tmpFolder -xf "$targetFile"
+sudo mkdir -p $targetFolder
+(echo "yes"; echo "n") | sudo "$installer" -w "$tmpFolder" "$targetFolder"
+
+rm -rf "$targetFile"
+
+# Set env variables
+echo "export FBXSDK=$targetFolder" >> ~/.profile
+
+echo "FBX SDK = 2016.1.2" >> ~/versions.txt
+

coin/provisioning/common/fbx_macos.sh

@@ -0,0 +1,79 @@
+#!/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 installs FBX SDK
+
+# shellcheck source=./try_catch.sh
+source "${BASH_SOURCE%/*}/try_catch.sh"
+
+fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz"
+targetFolder="/opt/fbx"
+cachedUrl="/net/ci-files01-hki.intra.qt.io/hdd/www/input/fbx/$fileName"
+officialUrl="http://download.autodesk.com/us/fbx_release_older/2016.1.2/$fileName"
+sha1="f82535423c700c605320c52e13e781c92208ec6b"
+targetFolder="/tmp"
+targetFile="$targetFolder/$fileName"
+installer="$targetFolder/fbx20161_2_fbxsdk_clang_macos.pkg"
+
+ExceptionExtractPrimaryUrl=100
+
+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
+echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc
+echo "FBX SDK = 2016.1.2" >> ~/versions.txt
+

coin/provisioning/common/fbx_windows.ps1

@@ -0,0 +1,68 @@
+############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the provisioning scripts of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+. "$PSScriptRoot\helpers.ps1"
+
+# This script will install FBX SDK
+
+$version = "2016.1.2"
+
+$name = "fbx20161_2_fbxsdk_vs2015_win"
+$packageName = "$name.7z"
+$installerName = "$name.exe"
+$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\fbx\$packageName"
+$sha1 = "3690400625672bef6369bcf90dcde4d78b493b24"
+
+# The executable is an interactive installer only. We can't run it in a script silently.
+# $officialUrl = "http://download.autodesk.com/us/fbx_release_older/2016.1.2/$installerName"
+# This sha is for the executable
+# $sha1 = "54f581c7c19cf5a08cf5e7bc62b8cc7f0617558e"
+
+#$targetFile = "C:\Windows\Temp\$packageName"
+$targetFolder = "C:\Program Files\"
+
+#echo "Downloading '$installerName'"
+#Download $officialUrl $cacheUrl $targetFile
+#Verify-Checksum $targetFile $sha1
+
+echo "Extracting '$cacheUrl'"
+#Extract-7Zip $cacheUrl $targetFolder
+Start-Process -FilePath "C:\Utils\sevenzip\7z.exe" -ArgumentList "x -y `"$cacheUrl`" -o`"$targetFolder`"" -Wait
+
+#Remove-Item -Recurse -Force "$packageName"
+
+echo "Adding environment variables."
+[Environment]::SetEnvironmentVariable("FBXSDK", "$targetFolder\Autodesk\FBX\FBX SDK\2016.1.2", [EnvironmentVariableTarget]::Machine)
+
+echo "FBX SDK = $version" >> ~\versions.txt
+

coin/provisioning/common/http_proxy.txt

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

coin/provisioning/common/icu.ps1

@@ -39,29 +39,12 @@ $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
@@ -75,7 +58,6 @@ 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?
@@ -83,29 +65,12 @@ 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
@@ -119,7 +84,6 @@ 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

@@ -0,0 +1,88 @@
+#!/usr/bin/env bash
+
+#############################################################################
+##
+## Copyright (C) 2017 The Qt Company Ltd.
+## Contact: http://www.qt.io/licensing/
+##
+## This file is part of the test suite of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL21$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see http://www.qt.io/terms-conditions. For further
+## information use the contact form at http://www.qt.io/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 or version 3 as published by the Free
+## Software Foundation and appearing in the file LICENSE.LGPLv21 and
+## LICENSE.LGPLv3 included in the packaging of this file. Please review the
+## following information to ensure the GNU Lesser General Public License
+## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## As a special exception, The Qt Company gives you certain additional
+## rights. These rights are described in The Qt Company LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+source "${BASH_SOURCE%/*}/try_catch.sh"
+set -ex
+
+# Command line tools is need by homebrew
+
+function InstallCommandLineTools {
+
+    ExceptionMount=101
+    ExceptionInstall=102
+    ExceptionUnmount=103
+
+    url=$1
+    url_alt=$2
+    expectedSha1=$3
+    packageName=$4
+    version=$5
+
+    try
+    (
+        DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName
+        echo "Mounting $packageName"
+        hdiutil attach /tmp/$packageName || throw $ExceptionMount
+        cd "/Volumes/Command Line Developer Tools"
+        echo "Installing"
+        sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall
+        cd /
+        # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted
+        sleep 3
+        echo "Unmounting"
+        umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount
+        echo "Removing $packageName"
+        rm /tmp/$packageName
+
+        echo "Command Line Tools = $version" >> ~/versions.txt
+    )
+    catch || {
+        case $ex_code in
+            $ExceptionMount)
+                echo "Failed to mount"
+                exit 1;
+            ;;
+            $ExceptionInstall)
+                echo "Failed to install"
+                exit 1;
+            ;;
+            $ExceptionUnmount)
+                echo "Failed to unmount"
+                exit 1;
+
+        esac
+    }
+
+}

coin/provisioning/common/install-ruby.ps1

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

coin/provisioning/common/install_xcode.sh

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

coin/provisioning/common/integrity.sh

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

coin/provisioning/common/libclang.sh

@@ -40,6 +40,8 @@
 # In case of Linux, we expect to get the values as args
 set -e
 
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/sw_versions.txt
 url=$1

coin/provisioning/common/mesa_llvmpipe.ps1

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

coin/provisioning/common/openssl_for_android_linux.sh

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

coin/provisioning/common/python3.sh

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

coin/provisioning/common/qnx_700.sh

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

coin/provisioning/common/ruby.ps1

@@ -1,7 +0,0 @@
-. "$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/system_updates.sh

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

coin/provisioning/common/try_catch.sh

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

coin/provisioning/common/version.sh

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

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh

@@ -0,0 +1,42 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
+
+if [ "$proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: fix for possible bug in the subscription manager
 # version: provided by RedHat
 # needed for yum to work properly in case there is incorrect data in
 # the sslclientkey repository parameter value
+
+set -ex
+
 sudo rm -f /etc/pki/entitlement/*
 sudo subscription-manager refresh

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh

@@ -1,4 +1,8 @@
+#!/usr/bin/env bash
 # provides: odbc devel packages on RHEL
 # version: provided by default Linux distribution repository
 # needed for configure -plugin-sql-odbc in qtbase
+
+set -ex
+
 sudo yum install -y unixODBC-devel

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_version

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
+
+set -ex
+
 sudo yum install -y python-devel python-virtualenv
 
 # install the EPEL repository which provides python3

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

@@ -1 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
 $(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh

@@ -1,3 +1,6 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 # Required for tqtc-boot2qt/qdb
+
+set -ex
+
 sudo yum install -y libusb1-devel

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

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

coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh

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

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

@@ -1,4 +1,4 @@
-#!/bin/env bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -36,6 +36,9 @@
 # This script needs to be called last during provisioning so that the software information will show up last in provision log.
 
 # Storage installed RPM packages information
+
+set -ex
+
 echo "*********************************************" >> ~/versions.txt
 echo "***** All installed RPM packages *****" >> ~/versions.txt
 rpm -q -a | sort >> ~/versions.txt

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

@@ -1,120 +0,0 @@
-#!/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2016 The Qt Company Ltd.
-## Contact: http://www.qt.io/licensing/
-##
-## This file is part of the test suite of the Qt Toolkit.
-##
-## $QT_BEGIN_LICENSE:LGPL21$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see http://www.qt.io/terms-conditions. For further
-## information use the contact form at http://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 2.1 or version 3 as published by the Free
-## Software Foundation and appearing in the file LICENSE.LGPLv21 and
-## LICENSE.LGPLv3 included in the packaging of this file. Please review the
-## following information to ensure the GNU Lesser General Public License
-## requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## As a special exception, The Qt Company gives you certain additional
-## rights. These rights are described in The Qt Company LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-# This script install Android sdk and ndk.
-
-# It also runs update for SDK API level 21, latest SDK tools, latest platform-tools and build-tools version 23.0.3
-
-# Build-tools version 23.0.3 is the latest usable version for Red Hat 6. Newer version of build-tools, version 24.x.x, requires GLIBC_2.14, which is not available in Red Hat 6.
-
-# Android 16 is the minimum requirement for Qt 5.7 applications, but we need something more recent than that for building Qt itself.
-# E.g The Bluetooth features that require Android 21 will disable themselves dynamically when running on an Android 16 device.
-# That's why we need to use Andoid-21 API version in Qt 5.9.
-
-set -ex
-targetFolder="/opt/android"
-baseUrl="http://ci-files01-hki.intra.qt.io/input/android"
-
-# SDK
-sdkPackage="android-sdk_r24.4.1-linux.tgz"
-sdkBuildToolsVersion="23.0.3"
-sdkApiLevel="android-21"
-sdkUrl="$baseUrl/$sdkPackage"
-sdkSha1="725bb360f0f7d04eaccff5a2d57abdd49061326d"
-sdkTargetFile="$targetFolder/$sdkPackage"
-sdkExtract="tar -C $targetFolder -zxf $sdkTargetFile"
-sdkFolderName="android-sdk-linux"
-sdkName="sdk"
-
-# NDK
-ndkVersion="r10e"
-ndkPackage="android-ndk-$ndkVersion-linux-x86_64.zip"
-ndkUrl="$baseUrl/$ndkPackage"
-ndkSha1="f692681b007071103277f6edc6f91cb5c5494a32"
-ndkTargetFile="$targetFolder/$ndkPackage"
-ndkExtract="unzip $ndkTargetFile -d $targetFolder"
-ndkFolderName="android-ndk-$ndkVersion"
-ndkName="ndk"
-
-function InstallAndroidPackage {
-    targetFolder=$1
-    version=$2
-    url=$3
-    sha1=$4
-    targetFile=$5
-    extract=$6
-    folderName=$7
-    name=$8
-
-    sudo wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
-    echo "$sha1  $targetFile" | sha1sum --check
-    sudo chmod 755 "$targetFile"
-    sudo $extract || echo "Failed to extract $url"
-    sudo chown -R qt:users "$targetFolder"/"$folderName"
-    sudo mv "$targetFolder"/"$folderName" "$targetFolder"/"$name" || echo "Failed to rename $name"
-    sudo rm -fr "$targetFolder"/"$version"
-}
-
-if [ -d "$targetFolder" ]; then
-    echo "Removing old Android installation"
-    sudo rm -fr "$targetFolder"
-fi
-
-sudo mkdir "$targetFolder"
-
-# Install Android SDK
-echo "Installing Android SDK version $sdkPackage..."
-InstallAndroidPackage "$targetFolder" $sdkPackage $sdkUrl $sdkSha1 $sdkTargetFile "$sdkExtract" $sdkFolderName $sdkName
-
-# Install Android NDK
-echo "Installing Android NDK version $ndkPackage..."
-InstallAndroidPackage "$targetFolder" $ndkPackage $ndkUrl $ndkSha1 $ndkTargetFile "$ndkExtract" $ndkFolderName $ndkName
-
-# run update for Android SDK and install SDK API version 21, latest SDK tools, platform-tools and build-tools
-echo "Running Android SDK update for API version 21, SDK-tools, platform-tools and build-tools-$sdkBuildToolsVersion..."
-echo "y" |"$targetFolder"/sdk/tools/android update sdk --no-ui --all --filter $sdkApiLevel,tools,platform-tools,build-tools-$sdkBuildToolsVersion
-
-echo 'export ANDROID_API_VERSION=android-21' >> ~/.bashrc
-
-# Storage version information to ~/versions.txt, which is used to print version information to provision log.
-echo "***** Android SDK *****" >> ~/versions.txt
-echo "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt
-echo "Android SDK Build Tools Version = $sdkBuildToolsVersion" >> ~/versions.txt
-platformTools="$(grep Pkg.Revision "$targetFolder"/sdk/platform-tools/source.properties | cut -c14-)"
-echo "Android Platform Tools = $platformTools" >> ~/versions.txt
-sdkTools="$(grep Pkg.Revision "$targetFolder"/sdk/tools/source.properties | cut -c14-)"
-echo "Android SDK Tools = $sdkTools" >> ~/versions.txt
-echo "***** Android NDK *****" >> ~/versions.txt
-echo "Android NDK Version = $ndkVersion" >> ~/versions.txt

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 # refresh local certificates
 sudo subscription-manager refresh
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,10 +33,11 @@
 ##
 #############################################################################
 
-set -e
+set -ex
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts"
 echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts
@@ -49,3 +50,7 @@ export DISPLAY=:0
 gsettings set org.gnome.desktop.screensaver lock-enabled false
 # disable blank screen power saving
 gsettings set org.gnome.desktop.session idle-delay 0
+
+if [ "$proxy" != "" ]; then
+    echo "proxy=$proxy" | sudo tee -a /etc/yum.conf
+fi

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh

@@ -0,0 +1,38 @@
+#!/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
+
+sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,8 +33,10 @@
 ##
 #############################################################################
 
+set -ex
+
 sudo yum-config-manager --enable rhel-server-rhscl7-rpms
-sudo yum -y install devtoolset-6
+sudo yum -y install devtoolset-4
 
-echo "source /opt/rh/devtoolset-6/enable" >> ~/.bashrc
+echo "source /opt/rh/devtoolset-4/enable" >> ~/.bashrc
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,66 +33,56 @@
 ##
 #############################################################################
 
-set -e
+set -ex
+
+installPackages=()
+installPackages+=(git)
+installPackages+=(zlib-devel)
+installPackages+=(glib2-devel)
+installPackages+=(openssl-devel)
+installPackages+=(freetype-devel)
+installPackages+=(fontconfig-devel)
+# EGL support
+installPackages+=(mesa-libEGL-devel)
+installPackages+=(mesa-libGL-devel)
+installPackages+=(libxkbfile-devel)
+# Xinput2
+installPackages+=(libXi-devel)
+installPackages+=(python-devel)
+installPackages+=(mysql-server)
+installPackages+=(mysql)
+installPackages+=(mysql-devel)
+installPackages+=(postgresql-devel)
+installPackages+=(cups-devel)
+installPackages+=(dbus-devel)
+# gstreamer 1 for QtMultimedia
+installPackages+=(gstreamer1-devel)
+installPackages+=(gstreamer1-plugins-base-devel)
+# gtk3 style for QtGui/QStyle
+installPackages+=(gtk3-devel)
+# libusb1 for tqtc-boot2qt/qdb
+installPackages+=(libusb-devel)
+# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
+installPackages+=(speech-dispatcher-devel)
+# Python
+installPackages+=(python-devel python-virtualenv)
+# WebEngine
+installPackages+=(bison)
+installPackages+=(flex)
+installPackages+=(gperf)
+installPackages+=(alsa-lib-devel)
+installPackages+=(pulseaudio-libs-devel)
+installPackages+=(libXtst-devel)
+installPackages+=(nspr-devel)
+installPackages+=(nss-devel)
+# For Android builds
+installPackages+=(java-1.8.0-openjdk-devel)
+# For receiving shasum
+installPackages+=(perl-Digest-SHA)
+# INTEGRITY requirements
+installPackages+=(glibc.i686)
+# Enable Qt Bluetooth
+installPackages+=(bluez-libs-devel)
 
 sudo yum -y update
-
-sudo yum -y install git
-sudo yum -y install zlib-devel
-sudo yum -y install glib2-devel
-sudo yum -y install openssl-devel
-sudo yum -y install freetype-devel
-sudo yum -y install fontconfig-devel
-
-# EGL support
-sudo yum -y install mesa-libEGL-devel
-sudo yum -y install mesa-libGL-devel
-
-sudo yum -y install libxkbfile-devel
-
-# Xinput2
-sudo yum -y install libXi-devel
-
-sudo yum -y install python-devel
-sudo yum -y install mysql-server mysql
-sudo yum -y install mysql-devel
-sudo yum -y install postgresql-devel
-sudo yum -y install cups-devel
-sudo yum -y install dbus-devel
-
-# We have to downgrade to an older version of graphite2
-# to avoid a dependency version mismatch with gtk3-devel package.
-
-sudo yum -y downgrade graphite2-1.3.6-1.el7_2
-
-# gstreamer 1 for QtMultimedia
-sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel
-
-# gtk3 style for QtGui/QStyle
-sudo yum -y install gtk3-devel
-
-# libusb1 for tqtc-boot2qt/qdb
-sudo yum -y install libusb-devel
-
-# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
-sudo yum -y install speech-dispatcher-devel
-
-# Python
-sudo yum -y install python-devel python-virtualenv
-
-# WebEngine
-sudo yum -y install bison
-sudo yum -y install flex
-sudo yum -y install gperf
-sudo yum -y install alsa-lib-devel
-sudo yum -y install pulseaudio-libs-devel
-sudo yum -y install libXtst-devel
-
-# For Android builds
-sudo yum -y install java-1.8.0-openjdk-devel
-
-# For receiving shasum
-sudo yum -y install perl-Digest-SHA
-
-# INTEGRITY requirements
-sudo yum -y install glibc.i686
+sudo yum -y install "${installPackages[@]}"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -32,6 +32,9 @@
 ## $QT_END_LICENSE$
 ##
 #############################################################################
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
 name="p7zip"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+set -ex
 
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # This script installs CMake 3.6.2
 
+set -ex
+
 # CMake is needed for autotests that verify that Qt can be built with CMake
 
 source "${BASH_SOURCE%/*}/../common/cmake_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/qnx_700.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/integrity.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,10 +33,10 @@
 ##
 #############################################################################
 
-source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
-
 set -ex
 
+source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
+
 packageEpel="epel-release-latest-7.noarch.rpm"
 OfficialUrl="https://dl.fedoraproject.org/pub/epel/$packageEpel"
 CachedUrl="http://ci-files01-hki.intra.qt.io/input/redhat/$packageEpel"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/disable_selinux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh

@@ -0,0 +1,40 @@
+#!/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$
+##
+#############################################################################
+
+source /opt/rh/devtoolset-4/enable
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/fbx_linux.sh

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh

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

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh

@@ -0,0 +1,38 @@
+#!/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
+
+source "${BASH_SOURCE%/*}/../common/android_linux.sh"

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -36,7 +36,11 @@
 # This script modifies system settings for automated use
 
 # shellcheck source=../common/try_catch.sh
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 NTS_IP=10.212.2.216
 
@@ -44,6 +48,7 @@ ExceptionGsettings1=100
 ExceptionGsettings2=101
 ExceptionGsettings3=102
 ExceptionNTS=103
+ExceptionProxy=104
 
 try
 (
@@ -56,6 +61,10 @@ try
 
     echo "Set Network Test Server address to $NTS_IP in /etc/hosts"
     echo "$NTS_IP    qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS
+
+    if [ "$proxy" != "" ]; then
+        echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy
+    fi
 )
 catch || {
     case $ex_code in
@@ -75,6 +84,10 @@ catch || {
             echo "Failed to set network teset server address into /etc/hosts."
             exit 1;
         ;;
+        $ExceptionProxy)
+            echo "Failed to set proxy /etc/apt/apt.conf."
+            exit 1;
+        ;;
     esac
 }
 

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # Install required packages with APT
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
 ExceptionAPTUpdate=100
@@ -45,45 +47,107 @@ try
 (
     echo "Disabling auto update"
     sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED
+    for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do
+        sudo systemctl stop $service
+        sudo systemctl disable $service
+    done
+    # Git is not needed by builds themselves, but is nice to have
+    # immediately as one starts debugging
+    installPackages+=(git)
+    # 7zip is a needed decompressing tool
+    installPackages+=(p7zip)
+    # libssl-dev provides headers for OpenSSL
+    installPackages+=(libssl-dev)
+    # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
+    installPackages+=("^libxcb.*")
+    installPackages+=(libxkbcommon-dev)
+    installPackages+=(libxkbcommon-x11-dev)
+    installPackages+=(libx11-xcb-dev)
+    installPackages+=(libglu1-mesa-dev)
+    installPackages+=(libxrender-dev)
+    installPackages+=(libxi-dev)
+    # Enable linking to system dbus
+    installPackages+=(libdbus-1-dev)
+    # Needed libraries for WebEngine
+    installPackages+=(libudev-dev)
+    installPackages+=(libegl1-mesa-dev)
+    installPackages+=(libfontconfig1-dev)
+    installPackages+=(libxss-dev)
+    # Common event loop handling
+    installPackages+=(libglib2.0-dev)
+    # MySQL support
+    installPackages+=(libmysqlclient-dev)
+    # PostgreSQL support
+    installPackages+=(libpq-dev)
+    # SQLite support
+    installPackages+=(libsqlite3-dev)
+    # ODBC support
+    installPackages+=(unixodbc-dev)
+    # Support for FreeType font engine
+    installPackages+=(libfreetype6-dev)
+    # Enable the usage of system jpeg libraries
+    installPackages+=(libjpeg-dev)
+    # Enable support for printer driver
+    installPackages+=(libcups2-dev)
+    # Install libraries needed for QtMultimedia to be able to support all plugins
+    installPackages+=(libasound2-dev)
+    installPackages+=(libgstreamer1.0-dev)
+    installPackages+=(libgstreamer-plugins-base1.0-dev)
+    installPackages+=(libgstreamer-plugins-good1.0-dev)
+    installPackages+=(libgstreamer-plugins-bad1.0-dev)
+    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
+    installPackages+=(g++-multilib)
+    # python3 development package
+    installPackages+=(python3-dev)
+    installPackages+=(python3-pip)
+    installPackages+=(python3-virtualenv)
+    # Automates interactive applications (Needed by RTA to automate configure testing)
+    installPackages+=(expect)
+    installPackages+=(mesa-common-dev)
+    installPackages+=(libgl1-mesa-glx)
+    installPackages+=(libgl1-mesa-dev)
+    installPackages+=(libegl1-mesa-dev)
+    installPackages+=(curl)
+    installPackages+=(libicu-dev)
+    installPackages+=(zlib1g-dev)
+    installPackages+=(zlib1g)
+    installPackages+=(openjdk-8-jdk)
+    installPackages+=(libgtk-3-dev)
+    installPackages+=(ninja-build)
+    installPackages+=(libssl-dev)
+    installPackages+=(libxcursor-dev)
+    installPackages+=(libxcomposite-dev)
+    installPackages+=(libxdamage-dev)
+    installPackages+=(libxrandr-dev)
+    installPackages+=(libfontconfig1-dev)
+    installPackages+=(libxss-dev)
+    installPackages+=(libsrtp0-dev)
+    installPackages+=(libwebp-dev)
+    installPackages+=(libjsoncpp-dev)
+    installPackages+=(libopus-dev)
+    installPackages+=(libminizip-dev)
+    installPackages+=(libavutil-dev)
+    installPackages+=(libavformat-dev)
+    installPackages+=(libavcodec-dev)
+    installPackages+=(libevent-dev)
+    installPackages+=(bison)
+    installPackages+=(flex)
+    installPackages+=(gperf)
+    installPackages+=(libasound2-dev)
+    installPackages+=(libpulse-dev)
+    installPackages+=(libxtst-dev)
+    installPackages+=(libnspr4-dev)
+    installPackages+=(libnss3-dev)
+    installPackages+=(libopenal-dev)
+    installPackages+=(libbluetooth-dev)
+    #VirtualBox for RTA
+    installPackages+=(virtualbox)
+    installPackages+=(dkms)
+
     echo "Running update for apt"
     sudo apt-get update
     echo "Installing packages"
-    # Git is not needed by builds themselves, but is nice to have
-    # immediately as one starts debugging
-    yes | sudo aptdcon --hide-terminal --install git || throw $ExceptionAPT
-    # 7zip is a needed decompressing tool
-    yes | sudo aptdcon --hide-terminal --install p7zip || throw $ExceptionAPT
-    # libssl-dev provides headers for OpenSSL
-    yes | sudo aptdcon --hide-terminal --install libssl-dev || throw $ExceptionAPT
-    # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git
-    yes | sudo aptdcon --hide-terminal --install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT
-    # Enable linking to system dbus
-    yes | sudo aptdcon --hide-terminal --install libdbus-1-dev || throw $ExceptionAPT
-    # Needed libraries for WebEngine
-    yes | sudo aptdcon --hide-terminal --install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT
-    # Common event loop handling
-    yes | sudo aptdcon --hide-terminal --install libglib2.0-dev || throw $ExceptionAPT
-    # MySQL support
-    yes | sudo aptdcon --hide-terminal --install libmysqlclient-dev || throw $ExceptionAPT
-    # PostgreSQL support
-    yes | sudo aptdcon --hide-terminal --install libpq-dev || throw $ExceptionAPT
-    # SQLite support
-    yes | sudo aptdcon --hide-terminal --install libsqlite3-dev || throw $ExceptionAPT
-    # ODBC support
-    yes | sudo aptdcon --hide-terminal --install unixodbc-dev || throw $ExceptionAPT
-    # Support for FreeType font engine
-    yes | sudo aptdcon --hide-terminal --install libfreetype6-dev || throw $ExceptionAPT
-    # Enable the usage of system jpeg libraries
-    yes | sudo aptdcon --hide-terminal --install libjpeg-dev || throw $ExceptionAPT
-    # Enable support for printer driver
-    yes | sudo aptdcon --hide-terminal --install libcups2-dev || throw $ExceptionAPT
-    # Install libraries needed for QtMultimedia to be able to support all plugins
-    yes | sudo aptdcon --hide-terminal --install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT
-    yes | sudo aptdcon --hide-terminal --install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT
-    # Support for cross-building to x86 (needed by WebEngine boot2qt builds)
-    yes | sudo aptdcon --hide-terminal --install g++-multilib || throw $ExceptionAPT
-    # python3 development package
-    yes | sudo aptdcon --hide-terminal --install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT
+    sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT
 )
 catch || {
     case $ex_code in

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,7 +35,7 @@
 
 # This script installs the Yocto toolchain
 
-set -e
+set -ex
 
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh

@@ -33,5 +33,8 @@
 ##
 #############################################################################
 
-source /opt/rh/devtoolset-6/enable
+source /opt/rh/devtoolset-4/enable
+
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/fbx_linux.sh

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh

@@ -33,4 +33,6 @@
 ##
 #############################################################################
 
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/android_linux.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/cmake_linux.sh
+

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-# provides: python development libraries
-# version: provided by default Linux distribution repository
-# needed to build pyside
-sudo zypper -nq install python-devel python-virtualenv
-
-# install python3
-sudo zypper -nq install python3 python3-pip python3-virtualenv

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh

@@ -1,8 +1,10 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
 
 BASEDIR=$(dirname "$0")
 source $BASEDIR/../common/network_test_server_ip.txt
+source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh"
 
 sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc
 
@@ -11,3 +13,8 @@ echo "$network_test_server_ip    qt-test-server qt-test-server.qt-test-net" | su
 echo "Set DISPLAY"
 echo 'export DISPLAY=":0"' >> ~/.bashrc
 
+if [ "$proxy" != "" ]; then
+    sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy
+    sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy
+fi
+

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh

@@ -1,5 +1,6 @@
-#!/bin/bash
-set -e
+#!/usr/bin/env bash
+
+set -ex
 
 sudo zypper -nq install git
 # default compiler, gcc 4.8.5
@@ -46,3 +47,6 @@ sudo zypper -nq install libXrandr-devel
 sudo zypper -nq install libXtst-devel
 sudo zypper -nq install mozilla-nspr-devel
 sudo zypper -nq install mozilla-nss-devel
+
+# cups
+sudo zypper -nq install cups-devel

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -ex
+
 BASEDIR=$(dirname "$0")
 . $BASEDIR/../common/sw_versions.txt
 VERSION=$libclang_version

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh

@@ -1,6 +1,10 @@
+#!/usr/bin/env bash
 # provides: python development libraries
 # version: provided by default Linux distribution repository
 # needed to build pyside
+
+set -ex
+
 sudo pkcon -y refresh
 sudo pkcon -y install python-devel python-virtualenv
 

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh

@@ -1 +1,5 @@
+#!/usr/bin/env bash
+
+set -ex
+
 $(dirname $0)/../common/cmake_linux.sh

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,17 +37,17 @@
 
 source "${BASH_SOURCE%/*}/../common/DownloadURL.sh"
 
-set -e
+set -ex
 
 mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input"
 localMount="/mnt/storage/"
 
-iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz"
+iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz"
 iccPackageSource="$localMount/intel/$iccPackage"
 iccInstallPath="/opt/intel"
 iccTmpPath="/tmp/icc"
 
-iccLicense="l_icc.lic"
+iccLicense="l_icc_2018.lic"
 iccLicenseSource="$localMount/semisecure/$iccLicense"
 iccLicenseTarget="/home/qt/$iccLicense"
 
@@ -79,7 +79,7 @@ EOT
 
 # Export LD_LIBRARY_PATH to Coin
 echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc
-echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc
-echo "ICC = 18.0.0 20170811" >> ~/versions.txt
+echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc
+echo "ICC = 18.0.1 20171018" >> ~/versions.txt
 
 rm -rf "$iccTmpPath"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh

@@ -0,0 +1,39 @@
+#!/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
+
+# Having proxy set while running autotests makes them fail
+sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy
+

coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
 
 # Read .bashrc if exist
 printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n        . ~/.bashrc\nfi\n" >> ~/.bash_profile

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -33,6 +33,8 @@
 ##
 #############################################################################
 
+set -ex
+
 # This script modified system settings for automated use
 
 # shellcheck source=../common/try_catch.sh
@@ -126,4 +128,3 @@ catch || {
         ;;
     esac
 }
-

coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh

@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # XZ-Utils are needed for uncompressing xz-compressed files
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/InstallPKGFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -34,6 +34,9 @@
 #############################################################################
 
 # This script installs JDK
+
+set -ex
+
 echo "Installing Java Development Kit"
 
 # shellcheck source=../common/try_catch.sh

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

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -42,6 +42,8 @@
 # This will give you a file called "Content.part00.cpio.xz" that
 # can be renamed to Xcode_8.xz for this script.
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh

@@ -0,0 +1,46 @@
+#!/usr/bin/env 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$
+##
+#############################################################################
+
+set -ex
+
+source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh"
+
+version="8.3.2"
+packageName="CommandLineToolsforXcode$version.dmg"
+url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
+sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe"
+
+InstallCommandLineTools $url $url $sha1 $packageName $version
+

coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # MySQL is needed for Qt to be able to support MySQL
 
+set -ex
+
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # PostgreSQL is needed for Qt to be able to support PostgreSQL
 
+set -ex
+
 # shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh
 source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh"
 

coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh

@@ -1 +1,4 @@
+#!/usr/bin/env bash
+set -ex
+
 source "${BASH_SOURCE%/*}/../common/python3.sh"

coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh

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

coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -37,6 +37,8 @@
 
 # It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 
@@ -77,7 +79,7 @@ try
     sudo chown -R qt:wheel "$targetFolder"
 
     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
+    (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager
 
     echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc
     echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc

coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -ex
+
+BASEDIR=$(dirname "$0")
+$BASEDIR/../common/fbx_macos.sh
+

coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 #############################################################################
 ##
@@ -35,6 +35,8 @@
 
 # This script install OpenSSL
 
+set -ex
+
 # shellcheck source=../common/try_catch.sh
 source "${BASH_SOURCE%/*}/../common/try_catch.sh"
 # shellcheck source=../common/InstallFromCompressedFileFromURL.sh

coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh

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

coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh

@@ -1,2 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
+
+set -ex
+
 defaults write com.apple.CrashReporter DialogType server

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

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