Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	.gitmodules
	coin/provisioning/common/macos/docker_testserver.sh

Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab

7 files changed, 151 insertions, 91 deletions

diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh
index 64753844..3515b870 100755
--- a/coin/provisioning/common/linux/emsdk.sh
+++ b/coin/provisioning/common/linux/emsdk.sh
@@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
 # shellcheck source=../unix/DownloadURL.sh
 source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
 
-version="1.38.1"
+version="1.38.27"
 version_node="8.9.1"
 urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz"
 urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz"
@@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten
 urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz"
 urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz"
 urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz"
-sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3"
-sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7"
+sha1Emscripten="ff9748a8f6b8eaa8192cce9fe2befc801443a161"
+sha1EmscriptenLlvm="8f5cd026c98cd40e53e6d11fbc32b116280ef9bb"
 sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726"
 targetFolder="/opt/emsdk"
 sudo mkdir "$targetFolder"
diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh
deleted file mode 100755
index 5ad7dcba..00000000
--- a/coin/provisioning/common/macos/docker.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-#############################################################################
-##
-## Copyright (C) 2019 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
-
-# Download and install the Docker Toolbox for macOS (Docker Compose and Docker Machine).
-url="https://download.docker.com/mac/stable/DockerToolbox.pkg"
-target_file="DockerToolbox.pkg"
-
-if [ -x "$(command -v sha1sum)" ]
-then
-    # This part shall be used in CI environment only. The DownloadURL script needs sha1sum
-    # which is not included in the default macOS system. In addition, the cached pkg can't
-    # be downloaded out of the Qt internal network.
-    case ${BASH_SOURCE[0]} in
-        */macos/*) UNIX_PATH="${BASH_SOURCE[0]%/macos/*}/unix" ;;
-        */*) UNIX_PATH="${BASH_SOURCE[0]%/*}/../unix" ;;
-        *) UNIX_PATH="../unix" ;;
-    esac
-
-    source "$UNIX_PATH/DownloadURL.sh"
-    url_cached="http://ci-files01-hki.intra.qt.io/input/windows/DockerToolbox.pkg"
-    sha1="7196d2d30648d486978d29adb5837ff7876517c1"
-    DownloadURL $url_cached $url $sha1 $target_file
-else
-    curl $url -o $target_file
-fi
-sudo installer -pkg $target_file -target /
-docker --version
-docker-compose --version
-
-# Start testserver provisioning
-case ${BASH_SOURCE[0]} in
-    */macos/*) SERVER_PATH="${BASH_SOURCE[0]%/macos/*}/shared/testserver" ;;
-    */*) SERVER_PATH="${BASH_SOURCE[0]%/*}/../shared/testserver" ;;
-    *) SERVER_PATH="../shared/testserver" ;;
-esac
-
-# Nested virtualization - Print CPU features to verify that CI has enabled VT-X/AMD-v support
-case $(sysctl machdep.cpu.features) in
-    *VMX*) "$SERVER_PATH/docker_testserver.sh" VMX ;;
-    *) echo "VMX not found error! Please make sure Coin has enabled VT-X/AMD-v." >&2; exit 1 ;;
-esac
diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh
new file mode 100755
index 00000000..59e9b699
--- /dev/null
+++ b/coin/provisioning/common/unix/install_protobuff.sh
@@ -0,0 +1,75 @@
+#!/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$
+##
+#############################################################################
+
+# shellcheck source=./DownloadURL.sh
+source "${BASH_SOURCE%/*}/DownloadURL.sh"
+# shellcheck source=./SetEnvVar.sh
+source "${BASH_SOURCE%/*}/SetEnvVar.sh"
+
+# This script will install Google's Protocal Buffers which is needed by Automotive Suite
+
+version="3.6.1"
+sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
+externalUrl="https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+
+targetDir="$HOME/protobuf-$version"
+targetFile="$targetDir.zip"
+DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
+unzip "$targetFile" -d "$HOME"
+sudo rm "$targetFile"
+
+# devtoolset is needed when running configuration
+if uname -a |grep -qv "Darwin"; then
+    export PATH="/opt/rh/devtoolset-4/root/usr/bin:$PATH"
+fi
+
+echo "Configuring and building protobuf"
+cd "$targetDir"
+if uname -a |grep -q Darwin; then
+    ./configure --prefix "$(xcrun --sdk macosx --show-sdk-path)/usr/local"
+    SetEnvVar PATH "\$PATH:$(xcrun --sdk macosx --show-sdk-path)/usr/local/bin"
+else
+    ./configure
+fi
+make
+sudo make install
+
+# Refresh shared library cache if OS isn't macOS
+if uname -a |grep -qv "Darwin"; then
+    sudo ldconfig
+fi
+
+sudo rm -r "$targetDir"
diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1
index db53bcc9..cf144c90 100644
--- a/coin/provisioning/common/windows/android-openssl.ps1
+++ b/coin/provisioning/common/windows/android-openssl.ps1
@@ -53,10 +53,6 @@ Rename-Item C:\Utils\openssl-$version $destination
 Remove-Item -Path $zip
 Remove-Item C:\Utils\openssl-$version.tar
 
-# Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang"
-# Set-EnvironmentVariable "ANDROID_AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar"
-# Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr"
-
 # Make sure configure for openssl has a "make" and "perl" available
 $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin"
 
diff --git a/coin/provisioning/common/windows/dxsdk.ps1 b/coin/provisioning/common/windows/dxsdk.ps1
index ce2bbeb3..f796ae1d 100644
--- a/coin/provisioning/common/windows/dxsdk.ps1
+++ b/coin/provisioning/common/windows/dxsdk.ps1
@@ -4,16 +4,16 @@
 
 $package = "DXSDK_Jun10.exe"
 
-$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
-$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
-$exe = "C:\Windows\Temp\$package"
-
-Download $officialUrl $cachedUrl $exe
+$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
+$package_path = "C:\Windows\Temp\$package"
 
+Download $officialUrl $cachedUrl $package_path
+Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
-Run-Executable $exe "/u"
+Run-Executable $package_path "/u"
 
-Remove-Item -Path $exe
+Remove-Item -Path $package_path
 
 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt
diff --git a/coin/provisioning/common/windows/install-protobuf.ps1 b/coin/provisioning/common/windows/install-protobuf.ps1
new file mode 100644
index 00000000..fd3fb3d3
--- /dev/null
+++ b/coin/provisioning/common/windows/install-protobuf.ps1
@@ -0,0 +1,64 @@
+#############################################################################
+##
+## Copyright (C) 2019 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 Google's Protocol Buffers
+# Script requires Cmake to be installed and strawberry-perl not to be installed
+
+$version = "3.6.1"
+$sha1 = "44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+$officialUrl = "https://github.com/protocolbuffers/protobuf/releases/download/v$version/protobuf-all-$version.zip"
+$cachedUrl = "http://ci-files01-hki.ci.local/input/automotive_suite/protobuf-all-$version.zip"
+$zip = "C:\Utils\protobuf-all-$version.zip"
+$installationFolder = "C:\Utils\protobuf"
+
+Write-Host "Installing Protocol Buffers"
+Add-Path "C:\CMake\bin"
+Download "$officialUrl" "$cachedUrl" "$zip"
+Verify-Checksum "$zip" "$sha1"
+Extract-7Zip "$zip" C:\Utils
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build"
+New-Item -ItemType directory -Force -Path "C:\Utils\protobuf-$version\cmake\build\release"
+New-Item -ItemType directory -Force -Path "$installationFolder"
+cd "C:\Utils\protobuf-$version\cmake\build\release"
+cmd /c "`"C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Professional\\VC\\Auxiliary\\Build\\vcvars64.bat`" && cmake -G `"NMake Makefiles`" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=$installationFolder ../.. && nmake && nmake install"
+if(![System.IO.File]::Exists("$installationFolder\bin\protoc.exe")){
+    Write-Host "Can't find $installationFolder\bin\protoc.exe. Installation probably failed!"
+    exit 1
+}
+
+Remove-Item "$zip"
+
+Add-Path "$installationFolder\bin"
+Set-EnvironmentVariable PROTOBUF_INCLUDE "$installationFolder\include"
+Set-EnvironmentVariable PROTOBUF_LIB "$installationFolder\lib"
diff --git a/coin/provisioning/common/windows/mysql.ps1 b/coin/provisioning/common/windows/mysql.ps1
index 29ce0ab4..8ed91402 100644
--- a/coin/provisioning/common/windows/mysql.ps1
+++ b/coin/provisioning/common/windows/mysql.ps1
@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2017 The Qt Company Ltd.
+## Copyright (C) 2019 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -36,7 +36,7 @@
 # This script installs MySQL $version.
 # Both x86 and x64 versions needed when x86 integrations are done on x64 machine
 
-$version = "5.6.11"
+$version = "5.7.25"
 $baseNameX64 = "mysql-$version-winx64"
 $packagex64 = "C:\Windows\temp\$baseNameX64.zip"
 $baseNameX86 = "mysql-$version-win32"