Prospective fix for git lfs installation

Keys used to sign package repositories tend to have expiry dates and
therefore need to be changed from time to time. Therefore hardcoding
the key we expect here will break (as it does right now) and it's better
to retrieve the expected key via a secure transport.

The old key - per
http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex
- will expire on the 12 of January. That's probably why they changed the
key used to sign the repo before the expiry.

Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 0b18f12f99)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

.gitmodules

@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,185 +123,185 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
 	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwebview"]
 	depends = qtdeclarative
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = 5.12.2
+	branch = 5.12.1
 	status = addon

coin/platform_configs/default.txt

@@ -1,6 +1,6 @@
 Template                            Target OS           Target arch Compiler    Target Compiler Features
 ----------------------------------- ------------------- ----------- ----------- --------------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle
+qtci-windows-10-x86_64-10                                           MSVC2015                    DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
 qtci-windows-7-x86-3                                                Mingw73                     DeveloperBuild Release OpenGLDynamic
 qtci-windows-10-x86_64-10                               x86         MSVC2017                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
 qtci-windows-10-x86_64-10                                           MSVC2015                    Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
@@ -12,7 +12,6 @@ qtci-linux-Ubuntu-18.04-x86_64                                      GCC
 qtci-linux-Ubuntu-18.04-x86_64                                      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 SystemSQLite
-qtci-linux-openSUSE-42.3-x86_64     WebAssembly                     GCC                         Packaging DeveloperBuild NoPch DisableTests
 qtci-linux-RHEL-7.4-x86_64                                          GCC                         Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo
 qtci-macos-10.13-x86_64-2                                           Clang                       Packaging DebugAndRelease Release
 qtci-macos-10.12-x86_64-9                                           Clang                       DeveloperBuild NoFramework Release QtNamespace NoPch

coin/platform_configs/qt3d-runtime.txt

@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10                                   Mingw73
 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         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2

coin/platform_configs/qt5.txt

@@ -8,9 +8,9 @@ qtci-windows-10-x86_64-10                                   Mingw73
 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         Clang           Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
-qtci-windows-10-x86_64-10   Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         armv7       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         arm64       Mingw73     Clang           Packaging Release DisableTests OpenGLES2
-qtci-windows-10-x86_64-10   Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3        Android_ANY         x86         Mingw73     Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         armv7       Clang       Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         arm64       Clang       Clang           Packaging Release DisableTests OpenGLES2
 qtci-macos-10.13-x86_64-2   Android_ANY         x86         Clang       Clang           Packaging Release DisableTests OpenGLES2

coin/platform_configs/qtsaferenderer.txt

@@ -1,3 +0,0 @@
-Template                            Target OS           Target arch Compiler    Features
------------------------------------ ------------------- ----------- ----------- -------------------------------------------------------------------------------------
-qtci-windows-10-x86_64-10                                           Mingw73     DeveloperBuild Release OpenGLDynamic BuildExamples

coin/provisioning/common/linux/open62541.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,43 +33,41 @@
 ##
 #############################################################################
 
-# shellcheck source=./DownloadURL.sh
+set +e
-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
+# shellcheck disable=SC1090
 
-version="3.6.1"
+# We need to source to be able to use cmake in the shell
-sha1="44b8ba225f3b4dc45fb56d5881ec6a91329802b6"
+if uname -a |grep -q "Ubuntu"; then
-internalUrl="http://ci-files01-hki.intra.qt.io/input/automotive_suite/protobuf-all-$version.zip"
+    source ~/.profile
-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
+    source ~/.bashrc
 fi
+
+set -ex
+
+# shellcheck source=../unix/SetEnvVar.sh
+source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
+
+TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory"
+# shellcheck disable=SC2064
+trap "sudo rm -fr $TEMPDIR" EXIT
+cd "$TEMPDIR"
+
+sudo pip install --upgrade pip
+sudo pip install six
+
+git clone https://github.com/open62541/open62541.git open62541
+cd open62541
+git checkout 215651ab8db94e5eacdd10ec26a5a9fb96b9301f
+mkdir build
+cd build
+TARGETPATH=/opt/open62541
+cmake -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH="$TARGETPATH" ..
 make
+
 sudo make install
+sudo /sbin/ldconfig
 
-# Refresh shared library cache if OS isn't macOS
+SetEnvVar "CI_OPEN62541_GCC_X64_PREFIX" "$TARGETPATH"
-if uname -a |grep -qv "Darwin"; then
-    sudo ldconfig
-fi
 
-sudo rm -r "$targetDir"

coin/provisioning/common/linux/remove-update_notifier.sh

@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-sudo apt -q -y remove update-notifier update-manager

coin/provisioning/common/macos/libiodbc.sh

@@ -48,7 +48,7 @@ brew install libiodbc
 read -r -a arr <<< $(brew list --versions libiodbc)
 version=${arr[1]}
 
-SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}"
+SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include:$CPLUS_INCLUDE_PATH"
-SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}"
+SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib:$LIBRARY_PATH"
 
 echo "libiodbc = $version" >> ~/versions.txt

coin/provisioning/common/unix/DownloadURL.sh

@@ -40,8 +40,6 @@
 # If called directly from another script, it will exit the parent script
 # as well, if not called in its own subshell with parentheses.
 
-set -ex
-
 function DownloadURL {
     url=$1
     url_alt=$2
@@ -49,11 +47,11 @@ function DownloadURL {
     targetFile=$4
 
     echo "Downloading from primary URL '$url'"
-    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" ||  {
+    curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" ||  (
         echo "Failed to download '$url' multiple times"
         echo "Downloading from alternative URL '$url_alt'"
-        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; }
+        curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt"
-    }
+    )
 
     echo "Checking SHA1 on PKG '$targetFile'"
     echo "$expectedSha1 *$targetFile" > "$targetFile.sha1"

coin/provisioning/common/unix/install-breakpad.sh

@@ -1,81 +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$
-##
-############################################################################
-
-# shellcheck source=../unix/DownloadURL.sh
-source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
-# shellcheck source=../unix/SetEnvVar.sh
-source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
-
-set -ex
-
-breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
-breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
-breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
-breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
-
-linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
-linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
-linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
-linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
-
-targetBreakpad="/tmp/$breakpad_tar"
-targetSyscall="/tmp/$linux_syscall_support_tar"
-installFolder="$HOME"
-breakpadHome="$HOME/breakpad"
-
-# shellcheck disable=SC2015
-( DownloadURL "$breakpad_tar_url" "$breakpad_tar_url" "$breakpad_tar_sha" "$targetBreakpad" ) && (
-    DownloadURL "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_url" "$linux_syscall_support_tar_sha" "$targetSyscall"
-    ) && (
-    tar -xzf "$targetBreakpad" -C "$installFolder"
-    tar -xzf "$targetSyscall" -C "/tmp"
-    mv "/tmp/linux-syscall-support/" "$breakpadHome/src/third_party/lss/"
-    rm -rf $targetBreakpad
-    rm -rf $targetSyscall
-    ) || (
-    cd "$HOME"
-    git clone https://chromium.googlesource.com/breakpad/breakpad "$breakpadHome"
-    git clone https://chromium.googlesource.com/linux-syscall-support "$breakpadHome/src/third_party/lss"
-    cd "$breakpadHome"
-    git checkout "$breakpad_commit_sha"
-    cd "$breakpadHome/src/third_party/lss"
-    git checkout "$linux_syscall_support_commit_sha1"
-    )
-
-
-SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
-
-echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
-echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt

coin/provisioning/common/windows/android-openssl.ps1

@@ -53,6 +53,10 @@ 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 "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"
 

coin/provisioning/common/windows/android.ps1

@@ -85,7 +85,7 @@ if (IsProxyEnabled) {
     # Remove "http://" from the beginning
     $proxy = $proxy.Remove(0,7)
     $proxyhost,$proxyport = $proxy.split(':')
-    $sdkmanager_args = "--no_https", "--proxy=http", "--proxy_host=`"$proxyhost`"", "--proxy_port=`"$proxyport`""
+    $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" "
 }
 
 New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses
@@ -95,10 +95,9 @@ Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8
 # Get a PATH where Java's path is defined from previous provisioning
 [Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process")
 
+$sdkmanager_args += " platforms;$sdkApiLevel platform-tools build-tools;$sdkBuildToolsVersion"
+Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args"
 cd $toolsFolder\bin\
-$sdkmanager_args += "platforms;$sdkApiLevel", "platform-tools", "build-tools;$sdkBuildToolsVersion"
-$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat @sdkmanager_args'
-iex $command
 $command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses'
 iex $command
 cmd /c "dir C:\Utils\android"

coin/provisioning/common/windows/dxsdk.ps1

@@ -4,16 +4,16 @@
 
 $package = "DXSDK_Jun10.exe"
 
-$cachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
+$cacheUrl = "\\ci-files01-hki.intra.qt.io\provisioning\windows\$package"
 $officialUrl = "https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/$package"
-$sdkChecksumSha1 = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
+$sdkChecksum = "8fe98c00fde0f524760bb9021f438bd7d9304a69"
-$package_path = "C:\Windows\Temp\$package"
+$exe = "C:\Windows\Temp\$package"
+
+Download $officialUrl $cachedUrl $exe
 
-Download $officialUrl $cachedUrl $package_path
-Verify-Checksum $package_path $sdkChecksumSha1 sha1
 Write-Host "Installing DirectX SDK"
-Run-Executable $package_path "/u"
+Run-Executable $exe "/u"
 
-Remove-Item -Path $package_path
+Remove-Item -Path $exe
 
 Write-Output "DirectX SDK = 9.29.1962 (Jun 10)" >> ~\versions.txt

coin/provisioning/common/windows/helpers.ps1

@@ -35,28 +35,6 @@ function Run-Executable
     }
 }
 
-function Extract-tar_gz
-{
-    Param (
-        [string]$Source,
-        [string]$Destination
-    )
-    Write-Host "Extracting '$Source' to '$Destination'..."
-
-    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
-        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
-        if (-not (test-path $zipExe)) {
-            $zipExe = "C:\Utils\sevenzip\7z.exe"
-            if (-not (test-path $zipExe)) {
-                throw "Could not find 7-zip."
-            }
-        }
-    } else {
-        $zipExe = "7z.exe"
-    }
-    Run-Executable "cmd.exe"  "/C $zipExe x -y `"$Source`" -so | $zipExe x -y -aoa -si -ttar `"-o$Destination`""
-}
-
 function Extract-7Zip
 {
     Param (

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

@@ -1,94 +0,0 @@
-############################################################################
-##
-## 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$
-##
-############################################################################
-
-# This script install breakpad from sources.
-# for manual install.. remember to checkout correct version
-#   git clone https://chromium.googlesource.com/breakpad/breakpad
-#   git clone https://chromium.googlesource.com/linux-syscall-support breakpad/src/third_party/lss
-
-# Commit used to make this zip breakpad_20181113.tar.gz
-#   breakpad
-#       commit 66571f4838b2306161f072555cb199049bc68142 (HEAD -> master, origin/master, origin/HEAD)
-#   linux-syscall-support
-#       commit 93426bda6535943ff1525d0460aab5cc0870ccaf (HEAD -> master, origin/master, origin/HEAD)
-
-# This script installs breakpad.
-
-
-. "$PSScriptRoot\helpers.ps1"
-
-
-$breakpad_commit_sha="b988fa74ec18de6214b18f723e48331d9a7802ae"
-$breakpad_tar="breakpad_$breakpad_commit_sha.tar.gz"
-$breakpad_tar_url="http://ci-files01-hki.intra.qt.io/input/breakpad/$breakpad_tar"
-$breakpad_tar_sha="a2d404d2aebc947cdac5840a9bccd65dfafae24c"
-
-$linux_syscall_support_commit_sha1="93426bda6535943ff1525d0460aab5cc0870ccaf"
-$linux_syscall_support_tar="linux-syscall-support_$linux_syscall_support_commit_sha1.tar.gz"
-$linux_syscall_support_tar_url="http://ci-files01-hki.intra.qt.io/input/linux-syscall-support/$linux_syscall_support_tar"
-$linux_syscall_support_tar_sha="62565be0920f3661e138d68026b79fbbdc2a11e4"
-
-$targetBreakpad="$env:tmp\$breakpad_tar"
-$targetSyscall="$env:tmp\$linux_syscall_support_tar"
-$installFolder = "C:\Utils"
-
-# breakpad
-try {
-    Download $breakpad_tar_url $breakpad_tar_url $targetBreakpad
-    Verify-Checksum $targetBreakpad $breakpad_tar_sha
-    Extract-tar_gz $targetBreakpad $installFolder
-    Remove-Item -Path $targetBreakpad
-    # linux-syscall-support
-    Download $linux_syscall_support_tar_url $linux_syscall_support_tar_url $targetSyscall
-    Verify-Checksum $targetSyscall $linux_syscall_support_tar_sha
-    Extract-tar_gz $targetSyscall "$env:tmp\"
-    New-Item -ItemType directory -Path "$installFolder\breakpad\third_party\lss"
-    Get-ChildItem -Path "$env:tmp\linux-syscall-support\*" -Recurse | Move-Item -Destination "$installFolder\breakpad\third_party\lss"
-    Remove-Item -Path $targetSyscall
-}
-catch {
-    Write-Host "Cached download failed: Attempping fallback method eg git."
-    Set-Location $installFolder
-    git.exe clone "https://chromium.googlesource.com/breakpad/breakpad"
-    git.exe clone "https://chromium.googlesource.com/linux-syscall-support breakpad\third_party\ssl"
-    Set-Location  "breakpad"
-    git checkout $breakpad_commit_sha
-    Set-Location  "src/third_party/lss"
-    git checkout $linux_syscall_support_commit_sha1
-}
-
-Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
-
-# Write HEAD commit sha to versions txt, so build can be repeated at later date
-Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt
-Write-Output "linux-syscall-support = $linux_syscall_support_tar" >> ~/versions.txt

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

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

coin/provisioning/common/windows/opcua_unifiedautomation.ps1

@@ -1,6 +1,6 @@
 #############################################################################
 ##
-## Copyright (C) 2019 The Qt Company Ltd.
+## 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.
@@ -33,58 +33,27 @@
 
 . "$PSScriptRoot\helpers.ps1"
 
-function DownloadAndInstallUA
+$zip = Get-DownloadLocation "uasdkcpp.zip"
-{
+$sha1 = "e1927dbd5d8bb459b468fa70a70b1de51a4ce022"
-    Param (
+$installLocation = "C:\Utils\uacpp"
-        [string] $InstallerFileName = $(BadParam("no download URL specified")),
-        [string] $sha1 = $(BadParam("No SHA1 for download specified")),
-        [string] $Destination = $(BadParam("No location to install specified"))
-    )
-    Write-Host "UACPPSDK: DownloadAndInstallUA $InstallerFileName"
-    $zip = Get-DownloadLocation "uasdkcpp.zip"
 
-    Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
+Write-Host "UACPPSDK: Downloading Unified Automation CPP installer..."
-    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/$InstallerFileName.zip"
+$internalUrl = "http://ci-files01-hki.intra.qt.io/input/opcua_uacpp/uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.zip"
-    # No public download link exists
+# No public download link exists
-    $externalUrl = $internalUrl
+$externalUrl = $internalUrl
 
-    Download $externalUrl $internalUrl $zip
+Download $externalUrl $internalUrl $zip
-    Verify-Checksum $zip $sha1
+Verify-Checksum $zip $sha1
 
-    Write-Host "UACPPSDK: Extracting $zip..."
+Write-Host "UACPPSDK: Installing $zip..."
-    Extract-7Zip $zip (Get-DefaultDownloadLocation)
+Extract-7Zip $zip (Get-DefaultDownloadLocation)
-    Remove-Item -Path $zip
+Remove-Item -Path $zip
 
-    $executable = (Get-DefaultDownloadLocation) + "$InstallerFileName.exe"
+$executable = (Get-DefaultDownloadLocation) + "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.5.6-361.exe"
-    # We cannot call the installer as the x86 and x64 versions of the installer are not
+$arguments = "/S /D=$installLocation"
-    # allowed to be installed in parallel (they check for the same registry value and
+Run-Executable $executable $arguments
-    # delete each other). Extracting does not have a side-effect for Qt
+Write-Host "UACPPSDK: Installer done."
-    #$arguments = "/S /D=$installLocation"
+Remove-Item $executable
-    #Run-Executable $executable $arguments
-    #Write-Host "UACPPSDK: Installer done."
-    #Remove-Item $executable
 
-    Extract-7Zip $executable $Destination
+Write-Host "Set environment variable for COIN to locate SDK"
-    Remove-Item $executable
+Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation"
-}
-
-#x86 version
-$installerName86 = "uasdkcppbundle-bin-EVAL-win32-x86-vs2015-v1.6.3-406"
-$downloadSha86 = "C73278B4C10DF0E3D60ABAA159ABA9185095124C"
-$installLocation86 = "C:\Utils\uacpp_x86"
-
-DownloadAndInstallUA $installerName86 $downloadSha86 $installLocation86
-Set-EnvironmentVariable "CI_UACPP_msvc2015_x86_PREFIX" "$installLocation86"
-# For UA msvc2015 is binary compatible with msvc2017
-Set-EnvironmentVariable "CI_UACPP_msvc2017_x86_PREFIX" "$installLocation86"
-
-
-#x64 version
-$installerName64 = "uasdkcppbundle-bin-EVAL-win64-x86_64-vs2015-v1.6.3-406"
-$downloadSha64 = "1384e6882644f9163e9840aee962cdb9ca3398c8"
-$installLocation64 = "C:\Utils\uacpp_x64"
-
-DownloadAndInstallUA $installerName64 $downloadSha64 $installLocation64
-Set-EnvironmentVariable "CI_UACPP_msvc2015_x64_PREFIX" "$installLocation64"
-# For UA msvc2015 is binary compatible with msvc2017
-Set-EnvironmentVariable "CI_UACPP_msvc2017_x64_PREFIX" "$installLocation64"

coin/provisioning/common/windows/open62541.ps1

@@ -0,0 +1,265 @@
+#############################################################################
+##
+## 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$
+##
+#############################################################################
+
+Param (
+    [string]$targetCommand= ""
+    )
+
+. "$PSScriptRoot\helpers.ps1"
+
+## Variables for builds
+$commitSHA = "215651ab8db94e5eacdd10ec26a5a9fb96b9301f"
+$sha1 = "8d899f986071525be73e1ee8565b28ea10536d7d"
+$extractTarget = "C:\open62541_build"
+
+function CreateArchive
+{
+    param(
+        [string]$sourceDirectory=$(throw("You must specify a directory")),
+        [string]$archiveName=$(throw("You must specify an archive name"))
+    )
+
+    if ((Get-Command "7z.exe" -ErrorAction SilentlyContinue) -eq $null) {
+        $zipExe = join-path (${env:ProgramFiles(x86)}, ${env:ProgramFiles}, ${env:ProgramW6432} -ne $null)[0] '7-zip\7z.exe'
+        if (-not (test-path $zipExe)) {
+            $zipExe = "C:\Utils\sevenzip\7z.exe"
+            if (-not (test-path $zipExe)) {
+                throw "Could not find 7-zip."
+            }
+        }
+    } else {
+        $zipExe = "7z.exe"
+    }
+
+    Run-Executable $zipExe "a -y `"$archiveName`" `"$sourceDirectory`""
+}
+
+function PrepareRepository
+{
+    $username = $env:USERNAME
+    $zip = "c:\users\$username\downloads\open62541.zip"
+
+    $externalUrl = "https://github.com/open62541/open62541/archive/$commitSHA.zip"
+    $internalUrl = "http://ci-files01-hki.intra.qt.io/input/open62541/$commitSHA.zip"
+
+    Download $externalUrl $internalUrl $zip
+    Verify-Checksum $zip $sha1
+
+    Extract-7Zip $zip $extractTarget
+}
+
+function PushDevEnvironment
+{
+    # Provisioning updates the registry entries for PATH etc. However, they are not
+    # propagated to the next provisioning script and hence need to be manually
+    # read / set.
+    $adaptedPath = $env:PATH
+    $jomLocation = [Environment]::GetEnvironmentVariable("CI_JOM_PATH", "Machine")
+    $adaptedPath = $adaptedPath + ";" + $jomLocation
+    $adaptedPath = $adaptedPath + ";" + "C:\Python27"
+    $adaptedPath = $adaptedPath + ";" + "C:\CMake\bin"
+    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
+}
+
+function MSVCEnvironment
+{
+    Param (
+        [string]$msvcDir=$(throw("No VS Directory specified")),
+        [string]$msvcbat=$(throw("No vsvars batch file specified"))
+    )
+
+    Push-Location $msvcDir
+    cmd /c "$msvcbat&set" |
+    foreach {
+        if ($_ -match "=") {
+            $v = $_.split("="); Set-Item -force -path "ENV:\$($v[0])" -value "$($v[1])"
+        }
+    }
+    Pop-Location
+}
+
+function BuildAndInstallOpen62541
+{
+    Param (
+        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
+        [string]$Platform=$(throw("You must specify the target platform [x86, x64]")),
+        [string]$MakeCommand=$(throw("You must specify a make command [mingw32-make, nmake]"))
+    )
+    Write-Host "### Open62541: Supposed to build with: $Type $Platform $MakeCommand"
+
+    ## Make Build directory
+    $buildDir = "$extractTarget\open62541-$commitSHA\build" + "_" + $Type + "_" + $Platform
+    if (Test-Path $buildDir) {
+        Write-Host " Deleting pre-existing build directory"
+        Remove-Item $buildDir -Force -Recurse
+    }
+    New-Item -ItemType Directory -Force -Path $buildDir
+    Push-Location $buildDir
+
+    ## Invoke Cmake
+    $makeGenerator = "NMake Makefiles JOM"
+    $installTarget = "C:\Utils\open62541" + "_" + $Type + "_" + $Platform
+    if (Test-Path $installTarget) {
+        Write-Host " Deleting pre-existing install directory"
+        Remove-Item $installTarget -Force -Recurse
+    }
+
+    if ($Type.StartsWith("mingw")) {
+        $makeGenerator = "MinGW Makefiles"
+    }
+    cmake -G "$makeGenerator" -DUA_ENABLE_AMALGAMATION=ON -DUA_ENABLE_METHODCALLS=ON -DCMAKE_INSTALL_PREFIX:PATH=$installTarget -DLIB_INSTALL_DIR:PATH=$installTarget/lib ..
+
+    ## Call build command
+    Write-Host "### Open62541: Compilation ###"
+    Run-Executable $MakeCommand
+
+    ## call install command
+    Write-Host "### Open62541: Installation ###"
+    Run-Executable $MakeCommand install
+
+    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform + "_PREFIX"
+    Set-EnvironmentVariable $platformVariable $installTarget
+
+    ## Packaging
+    Push-Location "C:\Utils"
+    $archiveName = "open62541_" + $Type + "_" + $Platform + ".7z"
+    CreateArchive $installTarget $archiveName
+    Pop-Location
+
+    ## cleanup build directory
+    Write-Host "### Open62541: Cleanup ###"
+    Pop-Location
+    Remove-Item $buildDir -Force -Recurse
+}
+
+function DownloadAndInstall
+{
+    Param (
+        [string]$Type=$(throw("You must specify the dev type [mingw530, mingw630, mingw730, msvc2015, msvc2017]")),
+        [string]$Platform=$(throw("You must specify the target platform [x86, x64]"))
+    )
+    $baseLocation = "http://ci-files01-hki.intra.qt.io/input/open62541/"
+    $targetName = "open62541_" + $Type + "_" + $Platform
+    $archiveName =  $targetName + ".7z"
+    $downloadUrl = $baseLocation + $archiveName
+
+    # Download
+    $downloadTarget = "C:\Utils\" + $archiveName
+    Download $downloadUrl $downloadUrl $downloadTarget
+
+    # Extract
+    Push-Location C:\Utils
+    Extract-7Zip $downloadTarget C:\Utils
+    Pop-Location
+
+    # Set environment variable
+    $platformVariable = "CI_OPEN62541_" + $Type + "_" + $Platform
+    $platformPath = "C:\Utils\" + $targetName
+    Set-EnvironmentVariable $platformVariable $platformPath
+}
+
+##############################
+# Startup                    #
+##############################
+if ($targetCommand.StartsWith("mingw")) {
+    Write-Host "### Creating Open62541 for MinGW"
+    $mingwPath = [Environment]::GetEnvironmentVariable($targetCommand, "Machine")
+    if (!$mingwPath) {
+        throw("Could not find mingw")
+    }
+
+    # Strawberry has its own gcc, put mingw in front
+    $adaptedPath = $mingwPath + "\bin;" + [Environment]::GetEnvironmentVariable("PATH", "Machine")
+    [Environment]::SetEnvironmentVariable("PATH", $adaptedPath, "Process")
+
+    PushDevEnvironment
+    BuildAndInstallOpen62541 $targetCommand x86 "mingw32-make"
+} elseif ($targetCommand -eq "msvc2015_x86") {
+    Write-Host "### Creating Open62541 for MSVC2015 x86"
+    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat x86"
+    PushDevEnvironment
+    BuildAndInstallOpen62541 msvc2015 x86 jom
+} elseif ($targetCommand -eq "msvc2015_x64") {
+    Write-Host "### Creating Open62541 for MSVC2015 x64"
+    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC" "vcvarsall.bat amd64"
+    PushDevEnvironment
+    BuildAndInstallOpen62541 msvc2015 x64 jom
+} elseif ($targetCommand -eq "msvc2017_x86") {
+    Write-Host "### Creating Open62541 for MSVC2017 x86"
+    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars32.bat
+    PushDevEnvironment
+    BuildAndInstallOpen62541 msvc2017 x86 jom
+} elseif ($targetCommand -eq "msvc2017_x64") {
+    Write-Host "### Creating Open62541 for MSVC2017 x64"
+    MSVCEnvironment "C:\Program Files (x86)\Microsoft Visual Studio\2017\Professional\VC\Auxiliary\Build" vcvars64.bat
+    PushDevEnvironment
+    BuildAndInstallOpen62541 msvc2017 x64 jom
+} elseif ($targetCommand -eq "prepare") {
+    PrepareRepository
+} elseif ($targetCommand -eq "build") {
+    Write-Host "### Building for all supported platforms"
+    PrepareRepository
+    Write-Host "### Invoking MinGW530 build"
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw530
+    Write-Host "### Invoking MinGW630 build"
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw630
+    Write-Host "### Invoking MinGW730 build"
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand mingw730
+    Write-Host "### Invoking MSVC2015 build"
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x86
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2015_x64
+    Write-Host "### Invoking MSVC2017 build"
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x86
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand msvc2017_x64
+    Write-Host "### Archives have been generated at C:/Utils. Please upload manually"
+} elseif ($targetCommand -eq "packaged") {
+    Write-Host "### Expecting pre-built packages, download and install from archives"
+    Write-Host "### MinGW530 x64"
+    DownloadAndInstall mingw530 x86
+    Write-Host "### MinGW630 x64"
+    DownloadAndInstall mingw630 x86
+    Write-Host "### MinGW730 x64"
+    DownloadAndInstall mingw730 x64
+    Write-Host "### MSVC2015 x86"
+    DownloadAndInstall msvc2015 x86
+    Write-Host "### MSVC2015 x64"
+    DownloadAndInstall msvc2015 x64
+    Write-Host "### MSVC2017 x64"
+    DownloadAndInstall msvc2017 x64
+} elseif ($targetCommand) {
+    Write-Host "### Unknown parameter specified:" $targetCommand " Options are: mingw, msvc2015_x(86/64), msvc2017_x(86/64)"
+    throw("Unknown parameter")
+} else {
+    # Default behavior
+    PowerShell -ExecutionPolicy Bypass -File "$PSScriptRoot\open62541.ps1" -targetCommand build
+}

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

@@ -109,9 +109,6 @@ installPackages+=(xcb-util-image-devel)
 installPackages+=(xcb-util-keysyms-devel)
 installPackages+=(xcb-util-wm-devel)
 installPackages+=(xcb-util-renderutil-devel)
-# ODBC support
-installPackages+=(unixODBC-devel)
-installPackages+=(unixODBC)
 
 sudo yum -y install "${installPackages[@]}"
 

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/35-install-breakpad.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-breakpad.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-RHEL-7.4-x86_64/50-open62541.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,8 +33,5 @@
 ##
 #############################################################################
 
-set -ex
+# shellcheck source=../common/linux/open62541.sh
-
+source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
-# shellcheck source=../common/unix/install_protobuff.sh
-source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
-

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/35-install-breakpad.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-breakpad.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/50-open62541.sh

@@ -1,8 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/env bash
 
 #############################################################################
 ##
-## Copyright (C) 2018 The Qt Company Ltd.
+## Copyright (C) 2017 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -33,8 +33,4 @@
 ##
 #############################################################################
 
-set -ex
+source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
-
-# shellcheck source=../common/unix/install_protobuff.sh
-source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh"
-

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-remove-update_notifier.sh

@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# shellcheck source=../common/linux/remove-update_notifier.sh
-source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh"

coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/35-install-breakpad.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-breakpad.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/50-open62541.sh

@@ -1,7 +1,8 @@
+#!/bin/env bash
+
 #############################################################################
 ##
 ## Copyright (C) 2017 The Qt Company Ltd.
-## Copyright (C) 2017 Pelagicore AG
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the provisioning scripts of the Qt Toolkit.
@@ -32,13 +33,5 @@
 ##
 #############################################################################
 
-. "$PSScriptRoot\..\common\windows\helpers.ps1"
+# shellcheck source=../common/linux/open62541.sh
-
+source "${BASH_SOURCE%/*}/../common/linux/open62541.sh"
-# Signing tools are needed to sign offline installers when releasing
-
-$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip"
-$destination = "C:\Windows\temp\sign.zip"
-
-Download $url $url $destination
-Extract-7Zip "$destination" "C:\Utils"
-Remove-Item -Path "$destination"

coin/provisioning/qtci-macos-10.13-x86_64/35-install-breakpad.sh

@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-set -ex
-
-# shellcheck source=../common/unix/install-breakpad.sh
-source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh"

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

@@ -114,14 +114,14 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36"
 { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null
 { iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null
 
-iPhoneDeveloper="iosdevelopment_2019.p12"
+iPhoneDeveloper="iosdevelopment.p12"
-shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c"
+shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper
 echo "Importing $iPhoneDeveloper.."
 { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null
 
-iPhoneDistribution="iosdistribution_2019.p12"
+iPhoneDistribution="iosdistribution.p12"
-shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac"
+shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171"
 Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution
 echo "Importing $iPhoneDistribution.."
 { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null

coin/provisioning/qtci-windows-10-x86_64/04-msys.ps1

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

coin/provisioning/qtci-windows-10-x86_64/35-install-breakpad.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"

coin/provisioning/qtci-windows-10-x86_64/79-open62541.ps1

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

coin/provisioning/qtci-windows-10-x86_64/92-install-protobuf.ps1

@@ -1,2 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-protobuf.ps1"
-

coin/provisioning/qtci-windows-7-x86/04-msys.ps1

@@ -1,4 +1,4 @@
-. "$PSScriptRoot\helpers.ps1"
+. "$PSScriptRoot\..\common\windows\helpers.ps1"
 
 # This script will install msys which is needed for configuring openssl for Android
 

coin/provisioning/qtci-windows-7-x86/35-install-breakpad.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"

coin/provisioning/qtci-windows-7-x86/79-open62541.ps1

@@ -0,0 +1,2 @@
+. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand prepare
+. "$PSScriptRoot\..\common\windows\open62541.ps1" -targetCommand mingw730

coin/provisioning/qtci-windows-7-x86_64/35-install-breakpad.ps1

@@ -1 +0,0 @@
-. "$PSScriptRoot\..\common\windows\install-breakpad.ps1"