From a0bf828433b375c752713d6935ddb9134b2c68d3 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Dec 2017 12:57:22 +0100 Subject: [PATCH 01/22] Adjust submodule branches Change-Id: I3d6535fee48d27c87aab32847f5486a331402df1 --- .gitmodules | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4988927..b71cddd3 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.4 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.4 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + 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 + branch = 5.9.4 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + 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 + branch = 5.9.4 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.4 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,101 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.4 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.9.4 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 + branch = 5.9.4 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 + branch = 5.9.4 status = preview [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.9.4 status = preview From 2d71b84893af65823d6ab18afffebfffdc032333 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 23 Dec 2017 18:34:36 +0100 Subject: [PATCH 02/22] Update submodules on '5.9' in qt5 Change-Id: I88561b7971943d494f81fe309d849f5c0d94d2e3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index ffc8409a..44ef95a8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ffc8409aa58c04c1dd140001976b55925ac959f6 +Subproject commit 44ef95a885f440a33e79ff3f9a79d4bb6d408dda diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c40486ac..31a65540 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c40486acc352d49398186fa32d1ccabdd5fc83c6 +Subproject commit 31a655402ff194e556853e6877f1a464a8e51243 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6ecb881b..cb5fab80 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6ecb881bdc73a4ab1f4485e14bb87c18aac771ca +Subproject commit cb5fab803f3227f4c678a6a694d907fc385c7b05 From 1399d6e130596443f98fdb3f3d52d3aa30facb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Dec 2017 22:46:45 +0200 Subject: [PATCH 03/22] Add set -ex to provisioning scripts for RHEL 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1659 Change-Id: I9e3c1ec559eab29ccb693956201fc2b63f999882 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../001-refresh-subscription-manager.sh | 2 ++ .../001-systemsetup.sh | 2 +- .../002-enable-repos.sh | 36 +++++++++++++++++++ .../003-install-devtoolset.sh | 2 ++ .../004-install-packages.sh | 2 +- .../005-libclang.sh | 1 + .../qtci-linux-RHEL-7.4-x86_64/006-cmake.sh | 2 ++ .../qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh | 2 ++ .../008-integrity.sh | 2 ++ .../009-disable_selinux.sh | 2 ++ .../010-openssl_for_android_linux.sh | 3 ++ .../040-android_linux.sh | 2 ++ .../08-pythondev.sh | 4 +-- 13 files changed, 58 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh index a76a8638..2f7adf54 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # refresh local certificates sudo subscription-manager refresh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh index 22bf19a3..f2caf274 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh index 2697de04..08c4371a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh @@ -1,2 +1,38 @@ #!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + sudo subscription-manager repos --enable rhel-workstation-rhscl-7-rpms diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh index 439e2db5..5667058f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + sudo yum-config-manager --enable rhel-server-rhscl7-rpms sudo yum -y install devtoolset-4 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index a8e812bd..4565a843 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -33,7 +33,7 @@ ## ############################################################################# -set -e +set -ex installPackages=() installPackages+=(git) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh index abbda212..bf2e1ce9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/sw_versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh index 46976e9a..bd94aba9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh @@ -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" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh index 4a4031cc..73591496 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/qnx_700.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh index 56b1556d..b8c88dee 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/integrity.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh index 3eced1a4..e91cee9f 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh index b69295fc..af7d7c13 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh @@ -34,4 +34,7 @@ ############################################################################# source /opt/rh/devtoolset-4/enable + +set -ex + source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh index 637c4224..5808a45c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh @@ -33,4 +33,6 @@ ## ############################################################################# +set -ex + source "${BASH_SOURCE%/*}/../common/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 6ae0f820..40cb276a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -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" From fb282b2e58e126dd5fb65ccc3cfd2bdc22db6509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Dec 2017 09:30:02 +0200 Subject: [PATCH 04/22] Provision fbx to RHEL 7.4 for 3DStudio MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2aaad4abc2e3d42bdd1f5204d20ee4fea3c0388f Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh new file mode 100755 index 00000000..bf9b64af --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -ex + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/fbx_linux.sh From 70d3800aab5c3edd9e4551a9c9f23fa2e9b53b13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 21 Dec 2017 08:39:04 +0200 Subject: [PATCH 05/22] Remove provisioning of ICU for VS2012 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Visual Studio 2012 isn't used in our builds. Change-Id: I7f2480a1811efd1c1f164f468407ab55d5c4102d Reviewed-by: Simo Fält --- coin/provisioning/common/icu.ps1 | 36 -------------------------------- 1 file changed, 36 deletions(-) diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 index 16dd8a6f..c08748d8 100644 --- a/coin/provisioning/common/icu.ps1 +++ b/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") } From b23faee265630632a0fa057d226d0fe3f3f25140 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:39:38 +0200 Subject: [PATCH 06/22] Add set -ex to provisioning scripts for osx-10.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I56ecd39a553b8b777eac0f8822cfd3263e972ef5 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh | 2 +- .../qtci-osx-10.11-x86_64/021-install-commandlinetools.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh | 3 +++ coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh | 2 ++ 15 files changed, 33 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh index ba8dbdd3..77c41533 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh index 4a07bbbe..3e495a63 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh @@ -35,6 +35,8 @@ # This script modified system settings for automated use +set -ex + # shellcheck source=../common/try_catch.sh source "${BASH_SOURCE%/*}/../common/try_catch.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh index 61406203..2cdedcf5 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh @@ -1,3 +1,6 @@ #!/bin/sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh index 8a3999b9..61c7fc6d 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh @@ -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" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh index 37acc2ee..8ca4a3ac 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh @@ -42,7 +42,7 @@ # 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" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh index 9145c12a..2f46c41d 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.2" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh index 1e4de16a..3e545d9e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh @@ -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" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh index a990829e..b7393895 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh @@ -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" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/026-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 diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/08-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 From cec7c072838359522ad2743e765d0c6315de907c Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:35:25 +0200 Subject: [PATCH 07/22] Add set -ex to provisioning scripts for osx-10.10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I732df317aa0016b1d970e0d37167a3fc9276a645 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh | 3 +++ coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh | 2 ++ .../qtci-osx-10.10-x86_64/002-disable-screensaver.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh | 2 ++ 7 files changed, 15 insertions(+) diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh index ba8dbdd3..77c41533 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh index b05dcf1c..a1ab3a92 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh index 44df94e7..d5b2101e 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + mkdir -p $HOME/Library/LaunchAgents cat >$HOME/Library/LaunchAgents/no-screensaver.plist < diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-osx-10.10-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/08-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 From 28bf922739591ea47800fae36a77e17f4f3ec7ae Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:32:35 +0200 Subject: [PATCH 08/22] Add set -ex to provisioning scripts for macos-10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ieea4f84909c552728614a4d3c23d4c8ab9134fb2 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh | 2 ++ .../qtci-macos-10.12-x86_64/021-install-commandlinetools.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh | 3 +++ coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh | 2 ++ coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh | 2 ++ 20 files changed, 45 insertions(+) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh index 0fbe7628..a59e3e63 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh @@ -1,5 +1,7 @@ #!/bin/sh +set -ex + # Read .bashrc if exist printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh index 5819e9de..7b1b967c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh @@ -33,6 +33,8 @@ ## ############################################################################# +set -ex + # This script modified system settings for automated use # shellcheck source=../common/try_catch.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh index ba8dbdd3..77c41533 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh @@ -1,2 +1,5 @@ #!/bin/sh + +set -ex + defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh index 61406203..2cdedcf5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh @@ -1,3 +1,6 @@ #!/bin/sh + +set -ex + # Enables the usage of temporary keychains for SSL autotests echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh index ef676ab3..5171156c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh @@ -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" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh index 743cc9da..4c76f16a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh @@ -34,6 +34,9 @@ ############################################################################# # This script installs JDK + +set -ex + echo "Installing Java Development Kit" # shellcheck source=../common/try_catch.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh index 6d57bfaa..72e521c5 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh @@ -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" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh index b460cc02..352c8342 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" version="8.3.2" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh index ddb01d64..3cdbd463 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh index 63ec9b69..9fb5d672 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh index ca21f481..0ccd34f9 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh @@ -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" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh index 07c9a617..9e1df19a 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh index cb5c1852..3de6cc89 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh @@ -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" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh index cd4e3fd9..86bee612 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh @@ -1 +1,3 @@ +set -ex + source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh index 4fb9ddbc..15511332 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-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 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh index 9e4f1d3e..8cdb7108 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh @@ -1,4 +1,6 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh index d257ffa1..2a8a90c3 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/027-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 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh index bc8a95e6..0b15d557 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh @@ -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" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh index 50c6796b..acefd8b7 100644 --- a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh @@ -1,5 +1,7 @@ #!/usr/bin/env bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_macos.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh index d109051d..9dd79862 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh @@ -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 From 66595488f0abfd0e078e93f61a5e209c848129c4 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:25:50 +0200 Subject: [PATCH 09/22] Add set -ex to provisioning scripts for Ubuntu-16.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icc4b58080875255d8c2efe3e5db2c05e18127606 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh index 2498e441..c9484698 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh @@ -36,6 +36,9 @@ # This script modifies system settings for automated use # shellcheck source=../common/try_catch.sh + +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" NTS_IP=10.212.2.216 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh index 980da2ca..7c332aed 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh @@ -35,6 +35,8 @@ # Install required packages with APT +set -ex + source "${BASH_SOURCE%/*}/../common/try_catch.sh" ExceptionAPTUpdate=100 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh index 050f4aba..1382b279 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh @@ -35,7 +35,7 @@ # This script installs the Yocto toolchain -set -e +set -ex source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh index 7c5fadcb..b121d604 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh @@ -1,4 +1,6 @@ #!/bin/bash +set -ex + BASEDIR=$(dirname "$0") $BASEDIR/../common/fbx_linux.sh From ca89bec297612752a7f9c6015f236631e1401e92 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:22:57 +0200 Subject: [PATCH 10/22] Add set -ex to provisioning scripts for RHEL 6.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6e6e66cffcbd84af1e093176d65751063492122b Reviewed-by: Tony Sarajärvi --- .../05-subscription-manager-tooling.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh | 3 +++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh | 3 +++ 7 files changed, 19 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh index 852c1100..59fd541f 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -2,5 +2,8 @@ # 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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh index f6c90a75..4e4fb462 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,4 +1,7 @@ # 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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index aa64a892..5248f86f 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh index 0003127a..43ba9ecd 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,6 +1,9 @@ # 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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh index d7abd285..5c88e498 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1 +1,3 @@ +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh index 229e259f..1831ea52 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh @@ -1,3 +1,6 @@ #!/bin/env bash # Required for tqtc-boot2qt/qdb + +set -ex + sudo yum install -y libusb1-devel diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh index 5ef5f0e9..836f6ec4 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh @@ -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 From d29192ad3f499bd09da0e811d03f60d6a7aa6476 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 12:17:55 +0200 Subject: [PATCH 11/22] Add set -ex to provisioning scripts for openSUSE-42.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I71fb0074bc07ce3085401ac23be77ea32e52dcfa Reviewed-by: Tony Sarajärvi --- .../qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh | 2 ++ coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 3 +++ coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 ++ .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 3 +++ 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh index 4b2f2546..d01ed9e9 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex BASEDIR=$(dirname "$0") source $BASEDIR/../common/network_test_server_ip.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh index 132b3361..b8495402 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -ex sudo zypper -nq install git # default compiler, gcc 4.8.5 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh index d8874561..1105d303 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh @@ -2,6 +2,8 @@ # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside +set -ex + sudo zypper -nq install python-devel python-virtualenv # install python3 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d10bc06d..f1f2d5bd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1,2 +1,5 @@ #!/usr/bin/env bash + +set -ex + $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 15b46aef..01e1291c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -37,7 +37,7 @@ source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" -set -e +set -ex mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index abbda212..f0e0f19c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/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 diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh index ce0badc0..51516380 100644 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -1,6 +1,9 @@ # 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 From fcc0feaacb91ab5aefb212d351dcea7c728eefa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Thu, 23 Nov 2017 13:44:19 +0200 Subject: [PATCH 12/22] Add clean Ubuntu 16.04 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently Ubuntu 16.04 template has stuff installed on its tier 1. We want to have a clean installed tier 1 and install everything on it during provisioning. This will save some disk space on our hosts. Task-number: QTQAINFRA-1574 Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 10 +- coin/platform_configs/qtdeclarative.txt | 4 +- coin/provisioning/common/android_linux.sh | 7 +- .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-apt.sh => 02-apt.sh} | 129 ++++++++++++------ .../{003-qemu.sh => 03-qemu.sh} | 0 .../{004-yocto.sh => 04-yocto.sh} | 0 .../10-openssl_for_android_linux.sh | 40 ++++++ .../{030-fbx.sh => 30-fbx.sh} | 0 .../40-android_linux.sh | 38 ++++++ 10 files changed, 181 insertions(+), 47 deletions(-) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{002-apt.sh => 02-apt.sh} (56%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{003-qemu.sh => 03-qemu.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{004-yocto.sh => 04-yocto.sh} (100%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 5cb2bff5..805b32e9 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -7,8 +7,8 @@ qtci-windows-10-x86_64-10 x86 MSVC2015 qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo -qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation +qtci-linux-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,8 +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 diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt index 3139af8b..9d321d40 100644 --- a/coin/platform_configs/qtdeclarative.txt +++ b/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 diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index ee3008c1..232326b7 100644 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -79,8 +79,11 @@ 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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh similarity index 56% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 7c332aed..d6e53954 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/002-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -51,47 +51,100 @@ try 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) + 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 - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install git || throw $ExceptionAPT - # 7zip is a needed decompressing tool - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install p7zip || throw $ExceptionAPT - # libssl-dev provides headers for OpenSSL - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libssl-dev || throw $ExceptionAPT - # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "^libxcb.*" libx11-xcb-dev libglu1-mesa-dev libxrender-dev libxi-dev || throw $ExceptionAPT - # Enable linking to system dbus - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libdbus-1-dev || throw $ExceptionAPT - # Needed libraries for WebEngine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libudev-dev libegl1-mesa-dev libfontconfig1-dev libxss-dev || throw $ExceptionAPT - # Common event loop handling - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libglib2.0-dev || throw $ExceptionAPT - # MySQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libmysqlclient-dev || throw $ExceptionAPT - # PostgreSQL support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libpq-dev || throw $ExceptionAPT - # SQLite support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libsqlite3-dev || throw $ExceptionAPT - # ODBC support - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install unixodbc-dev || throw $ExceptionAPT - # Support for FreeType font engine - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libfreetype6-dev || throw $ExceptionAPT - # Enable the usage of system jpeg libraries - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libjpeg-dev || throw $ExceptionAPT - # Enable support for printer driver - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libcups2-dev || throw $ExceptionAPT - # Install libraries needed for QtMultimedia to be able to support all plugins - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libasound2-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev || throw $ExceptionAPT - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install libgstreamer-plugins-good1.0-dev libgstreamer-plugins-bad1.0-dev || throw $ExceptionAPT - # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install g++-multilib || throw $ExceptionAPT - # python3 development package - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install python3-dev python3-pip python3-virtualenv || throw $ExceptionAPT - # Automates interactive applications (Needed by RTA to automate configure testing) - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install expect || throw $ExceptionAPT + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT ) catch || { case $ex_code in diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/004-yocto.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh new file mode 100755 index 00000000..af7d7c13 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/10-openssl_for_android_linux.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +source /opt/rh/devtoolset-4/enable + +set -ex + +source "${BASH_SOURCE%/*}/../common/openssl_for_android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/030-fbx.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh new file mode 100755 index 00000000..5808a45c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-android_linux.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/android_linux.sh" From d6f7d6ed8bb530ca22d1a9250d79adfd960151bb Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 20 Dec 2017 13:25:40 +0200 Subject: [PATCH 13/22] Provisioning: VirtualBox for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA needs VirtualBox for running GammaRayPlugin RTA tests. Task-number: QTQAINFRA-1661 Change-Id: If66d6a63355ed5cc8c8525408c2dfc8c4f3d1bac Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 3 ++ .../90-install-virtualbox.ps1 | 51 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index d6e53954..7cc16024 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -140,6 +140,9 @@ try 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 diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 new file mode 100644 index 00000000..4d09becf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-install-virtualbox.ps1 @@ -0,0 +1,51 @@ +############################################################################ +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\..\common\helpers.ps1" + +# This script will install VirtualBox + +$version = "5.2.4" +$sha1 = "71df4474a5e94918728b62d1f6bc036674ef0e96" +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\VirtualBox-" + $version + "-119785-Win.exe" +$url_official = "http://download.virtualbox.org/virtualbox/" + $version + "/VirtualBox-" + $version + "-119785-Win.exe" +$virtualboxPackage = "C:\Windows\Temp\virtualbox-$version.exe" + +Download $url_official $url_cache $virtualboxPackage +Verify-Checksum $virtualboxPackage $sha1 +Start-Process $virtualboxPackage -ArgumentList "--silent" -Wait + +echo "Cleaning $virtualboxPackage.." +Remove-Item -Recurse -Force "$virtualboxPackage" + +echo "VirtualBox = $version" >> ~\versions.txt From 19f8a741f3556271dc4ef598bbf725f89b733b6a Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 27 Dec 2017 11:12:09 +0200 Subject: [PATCH 14/22] Make provisioning script prefix style match across platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are using different styles and amount of digits for the provisioning script prefixes. This change will unify them across the platforms. Also removes a couple of duplicate files. Task-number: QTQAINFRA-1668 Change-Id: I039777e7616bccc29c6a4ac55db13326ae8dc87c Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- .../{libusb.sh => 20-libusb.sh} | 0 .../{install_icu.sh => 30-install_icu.sh} | 0 .../{patch_qnx.sh => 50-patch_qnx.sh} | 0 .../{version.sh => 99-version.sh} | 0 ...n-manager.sh => 01-refresh-subscription-manager.sh} | 0 .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-enable-repos.sh => 02-enable-repos.sh} | 0 ...-install-devtoolset.sh => 03-install-devtoolset.sh} | 0 ...{004-install-packages.sh => 04-install-packages.sh} | 0 .../{004-p7zip.sh => 04-p7zip.sh} | 0 .../{005-libclang.sh => 05-libclang.sh} | 0 .../{006-cmake.sh => 06-cmake.sh} | 0 .../{007-qnx_700.sh => 07-qnx_700.sh} | 0 .../{008-integrity.sh => 08-integrity.sh} | 0 .../{009-disable_selinux.sh => 09-disable_selinux.sh} | 0 ...ndroid_linux.sh => 10-openssl_for_android_linux.sh} | 0 .../{030-fbx.sh => 30-fbx.sh} | 0 .../{009-install_icu.sh => 30-install_icu.sh} | 0 .../{040-android_linux.sh => 40-android_linux.sh} | 0 .../qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh | 10 ---------- .../{001-systemsetup.sh => 01-systemsetup.sh} | 0 .../{002-zypperpackages.sh => 02-zypperpackages.sh} | 0 .../{009-cmake.sh => 09-cmake.sh} | 0 .../{018-icc.sh => 18-icc.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{005-systemsetup.sh => 05-systemsetup.sh} | 0 .../{006-crashreporter.sh => 06-crashreporter.sh} | 0 .../{007-SSL_keychain.sh => 07-SSL_keychain.sh} | 0 .../qtci-macos-10.12-x86_64/{015-xz.sh => 15-xz.sh} | 0 .../{020-java.sh => 20-java.sh} | 0 .../{020-xcode.sh => 20-xcode.sh} | 0 ...mandlinetools.sh => 21-install-commandlinetools.sh} | 0 .../{025-cmake.sh => 25-cmake.sh} | 0 .../{025-homebrew.sh => 25-homebrew.sh} | 0 .../{025-mysql.sh => 25-mysql.sh} | 0 .../qtci-macos-10.12-x86_64/{025-pip.sh => 25-pip.sh} | 0 .../{025-postgresql.sh => 25-postgresql.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{026-p7zip.sh => 26-p7zip.sh} | 0 .../{026-virtualenv.sh => 26-virtualenv.sh} | 0 .../{027-libclang.sh => 27-libclang.sh} | 0 .../{030-android.sh => 30-android.sh} | 0 .../qtci-macos-10.12-x86_64/{030-fbx.sh => 30-fbx.sh} | 0 .../{035-openssl.sh => 35-openssl.sh} | 0 .../{555-signtools.sh => 55-signtools.sh} | 0 .../{001-crashreporter.sh => 01-crashreporter.sh} | 0 .../{001-system_updates.sh => 01-system_updates.sh} | 0 ...isable-screensaver.sh => 02-disable-screensaver.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{004-cmake.sh => 04-cmake.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{001-crashreporter.sh => 01-crashreporter.sh} | 0 .../{001-system_updates.sh => 01-system_updates.sh} | 0 .../{003-bashprofile.sh => 03-bashprofile.sh} | 0 .../{005-systemsetup.sh => 05-systemsetup.sh} | 0 .../{007-SSL_keychain.sh => 07-SSL_keychain.sh} | 0 .../qtci-osx-10.11-x86_64/{015-xz.sh => 15-xz.sh} | 0 .../{020-xcode.sh => 20-xcode.sh} | 0 ...mandlinetools.sh => 21-install-commandlinetools.sh} | 0 .../{025-cmake.sh => 25-cmake.sh} | 0 .../{025-homebrew.sh => 25-homebrew.sh} | 0 .../{025-mysql.sh => 25-mysql.sh} | 0 .../{025-postgresql.sh => 25-postgresql.sh} | 0 .../{025-python3.sh => 25-python3.sh} | 0 .../{026-p7zip.sh => 26-p7zip.sh} | 0 .../{08-libclang.sh => 27-libclang.sh} | 0 ...able-windefender.ps1 => 04-disable-windefender.ps1} | 0 .../qtci-windows-10-x86/{msvc.ps1 => 05-msvc.ps1} | 0 .../{005-wsearch-off.ps1 => 05-wsearch-off.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../qtci-windows-10-x86/{icu.ps1 => 10-icu.ps1} | 0 ...pdate3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} | 0 .../qtci-windows-10-x86/{jom.ps1 => 60-jom.ps1} | 0 .../qtci-windows-10-x86/{cmake.ps1 => 70-cmake.ps1} | 0 .../qtci-windows-10-x86/{libusb.ps1 => 90-libusb.ps1} | 0 ...able-windefender.ps1 => 01-disable-windefender.ps1} | 0 .../{002-disable-sleep.ps1 => 02-disable-sleep.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 .../qtci-windows-10-x86_64/{msvc.ps1 => 05-msvc.ps1} | 0 .../{005-wsearch-off.ps1 => 05-wsearch-off.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../{009-openssl.ps1 => 09-openssl.ps1} | 0 .../qtci-windows-10-x86_64/{icu.ps1 => 10-icu.ps1} | 0 ...pdate3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} | 0 .../qtci-windows-10-x86_64/{030-fbx.ps1 => 30-fbx.ps1} | 0 .../{030-qnx660.ps1 => 30-qnx660.ps1} | 0 .../{patch_qnx.ps1 => 50-patch_qnx.ps1} | 0 .../qtci-windows-10-x86_64/{jom.ps1 => 60-jom.ps1} | 0 .../qtci-windows-10-x86_64/{cmake.ps1 => 70-cmake.ps1} | 0 ...{3dstudio_3rdparty.ps1 => 90-3dstudio_3rdparty.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 .../{libusb.ps1 => 90-libusb.ps1} | 0 .../qtci-windows-10-x86_64/{mysql.ps1 => 90-mysql.ps1} | 0 .../{postgresql.ps1 => 90-postgresql.ps1} | 0 .../{signing-tools.ps1 => 90-signing-tools.ps1} | 0 .../{25-python3.ps1 => 08-python3.ps1} | 0 .../qtci-windows-7-x86/{12-icu.ps1 => 10-icu.ps1} | 0 coin/provisioning/qtci-windows-7-x86/25-python.ps1 | 1 - .../{32-patch_qnx.ps1 => 50-patch_qnx.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 | 1 - .../{001-disable-uac.ps1 => 01-disable-uac.ps1} | 0 .../{06-python.ps1 => 02-python.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 ...{msvc-2013-update5.ps1 => 09-msvc-2013-update5.ps1} | 0 .../{openssl.ps1 => 09-openssl.ps1} | 0 ...-test-server.ps1 => 09-set-network-test-server.ps1} | 0 .../qtci-windows-8.1-x86/{icu.ps1 => 10-icu.ps1} | 0 .../qtci-windows-8.1-x86/{cmake.ps1 => 60-cmake.ps1} | 0 .../qtci-windows-8.1-x86/{jom.ps1 => 70-jom.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 .../{001-disable-uac.ps1 => 01-disable-uac.ps1} | 0 .../{06-python.ps1 => 02-python.ps1} | 0 ...dows-updates.ps1 => 04-disable-windows-updates.ps1} | 0 ...{msvc-2013-update5.ps1 => 08-msvc-2013-update5.ps1} | 0 .../{python3.ps1 => 08-python3.ps1} | 0 .../{openssl.ps1 => 09-openssl.ps1} | 0 ...-test-server.ps1 => 09-set-network-test-server.ps1} | 0 .../qtci-windows-8.1-x86_64/{icu.ps1 => 10-icu.ps1} | 0 .../{cmake.ps1 => 60-cmake.ps1} | 0 .../qtci-windows-8.1-x86_64/{jom.ps1 => 70-jom.ps1} | 0 ...-install-notepad++.ps1 => 90-install-notepad++.ps1} | 0 123 files changed, 12 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{libusb.sh => 20-libusb.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{install_icu.sh => 30-install_icu.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{patch_qnx.sh => 50-patch_qnx.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{version.sh => 99-version.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{001-refresh-subscription-manager.sh => 01-refresh-subscription-manager.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{002-enable-repos.sh => 02-enable-repos.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{003-install-devtoolset.sh => 03-install-devtoolset.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{004-install-packages.sh => 04-install-packages.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{004-p7zip.sh => 04-p7zip.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{005-libclang.sh => 05-libclang.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{006-cmake.sh => 06-cmake.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{007-qnx_700.sh => 07-qnx_700.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{008-integrity.sh => 08-integrity.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{009-disable_selinux.sh => 09-disable_selinux.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{010-openssl_for_android_linux.sh => 10-openssl_for_android_linux.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{009-install_icu.sh => 30-install_icu.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{040-android_linux.sh => 40-android_linux.sh} (100%) delete mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{001-systemsetup.sh => 01-systemsetup.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{002-zypperpackages.sh => 02-zypperpackages.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{009-cmake.sh => 09-cmake.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{018-icc.sh => 18-icc.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{005-systemsetup.sh => 05-systemsetup.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{006-crashreporter.sh => 06-crashreporter.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{007-SSL_keychain.sh => 07-SSL_keychain.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{015-xz.sh => 15-xz.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{020-java.sh => 20-java.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{020-xcode.sh => 20-xcode.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{021-install-commandlinetools.sh => 21-install-commandlinetools.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-cmake.sh => 25-cmake.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-homebrew.sh => 25-homebrew.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-mysql.sh => 25-mysql.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-pip.sh => 25-pip.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-postgresql.sh => 25-postgresql.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{026-p7zip.sh => 26-p7zip.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{026-virtualenv.sh => 26-virtualenv.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{027-libclang.sh => 27-libclang.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{030-android.sh => 30-android.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{030-fbx.sh => 30-fbx.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{035-openssl.sh => 35-openssl.sh} (100%) rename coin/provisioning/qtci-macos-10.12-x86_64/{555-signtools.sh => 55-signtools.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{001-crashreporter.sh => 01-crashreporter.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{001-system_updates.sh => 01-system_updates.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{002-disable-screensaver.sh => 02-disable-screensaver.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{004-cmake.sh => 04-cmake.sh} (100%) rename coin/provisioning/qtci-osx-10.10-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{001-crashreporter.sh => 01-crashreporter.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{001-system_updates.sh => 01-system_updates.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{003-bashprofile.sh => 03-bashprofile.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{005-systemsetup.sh => 05-systemsetup.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{007-SSL_keychain.sh => 07-SSL_keychain.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{015-xz.sh => 15-xz.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{020-xcode.sh => 20-xcode.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{021-install-commandlinetools.sh => 21-install-commandlinetools.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-cmake.sh => 25-cmake.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-homebrew.sh => 25-homebrew.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-mysql.sh => 25-mysql.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-postgresql.sh => 25-postgresql.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{025-python3.sh => 25-python3.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{026-p7zip.sh => 26-p7zip.sh} (100%) rename coin/provisioning/qtci-osx-10.11-x86_64/{08-libclang.sh => 27-libclang.sh} (100%) rename coin/provisioning/qtci-windows-10-x86/{004-disable-windefender.ps1 => 04-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{msvc.ps1 => 05-msvc.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{005-wsearch-off.ps1 => 05-wsearch-off.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{msvc_2015_update3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{jom.ps1 => 60-jom.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{cmake.ps1 => 70-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{libusb.ps1 => 90-libusb.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{004-disable-windefender.ps1 => 01-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{002-disable-sleep.ps1 => 02-disable-sleep.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{msvc.ps1 => 05-msvc.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{005-wsearch-off.ps1 => 05-wsearch-off.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{009-openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{msvc_2015_update3_patch.ps1 => 10-msvc_2015_update3_patch.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{030-fbx.ps1 => 30-fbx.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{030-qnx660.ps1 => 30-qnx660.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{patch_qnx.ps1 => 50-patch_qnx.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{jom.ps1 => 60-jom.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{cmake.ps1 => 70-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{3dstudio_3rdparty.ps1 => 90-3dstudio_3rdparty.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{libusb.ps1 => 90-libusb.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{mysql.ps1 => 90-mysql.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{postgresql.ps1 => 90-postgresql.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{signing-tools.ps1 => 90-signing-tools.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{25-python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{12-icu.ps1 => 10-icu.ps1} (100%) delete mode 100644 coin/provisioning/qtci-windows-7-x86/25-python.ps1 rename coin/provisioning/qtci-windows-7-x86/{32-patch_qnx.ps1 => 50-patch_qnx.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) delete mode 100644 coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 rename coin/provisioning/qtci-windows-8.1-x86/{001-disable-uac.ps1 => 01-disable-uac.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{06-python.ps1 => 02-python.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{msvc-2013-update5.ps1 => 09-msvc-2013-update5.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{009-set-network-test-server.ps1 => 09-set-network-test-server.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{cmake.ps1 => 60-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{jom.ps1 => 70-jom.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{001-disable-uac.ps1 => 01-disable-uac.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{06-python.ps1 => 02-python.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{004-disable-windows-updates.ps1 => 04-disable-windows-updates.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{msvc-2013-update5.ps1 => 08-msvc-2013-update5.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{python3.ps1 => 08-python3.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{openssl.ps1 => 09-openssl.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{009-set-network-test-server.ps1 => 09-set-network-test-server.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{icu.ps1 => 10-icu.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{cmake.ps1 => 60-cmake.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{jom.ps1 => 70-jom.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{02-install-notepad++.ps1 => 90-install-notepad++.ps1} (100%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/libusb.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/version.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-refresh-subscription-manager.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/002-enable-repos.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/003-install-devtoolset.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-p7zip.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/005-libclang.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/006-cmake.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/007-qnx_700.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/008-integrity.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-disable_selinux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/010-openssl_for_android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/030-fbx.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/009-install_icu.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/040-android_linux.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh deleted file mode 100755 index 1105d303..00000000 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/008-pythondev.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# provides: python development libraries -# version: provided by default Linux distribution repository -# needed to build pyside -set -ex - -sudo zypper -nq install python-devel python-virtualenv - -# install python3 -sudo zypper -nq install python3 python3-pip python3-virtualenv diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/001-systemsetup.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/002-zypperpackages.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/005-systemsetup.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/006-crashreporter.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/007-SSL_keychain.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/015-xz.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/020-java.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-homebrew.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-homebrew.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-mysql.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-pip.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-pip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-postgresql.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/025-python3.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/026-p7zip.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/026-virtualenv.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/26-virtualenv.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh b/coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/027-libclang.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/030-android.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/030-fbx.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/035-openssl.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/555-signtools.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/001-crashreporter.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/001-system_updates.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/01-system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/002-disable-screensaver.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/04-cmake.sh diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.10-x86_64/025-python3.sh rename to coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/001-crashreporter.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/001-system_updates.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/01-system_updates.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/003-bashprofile.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/005-systemsetup.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/007-SSL_keychain.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/015-xz.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-homebrew.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-homebrew.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-mysql.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-postgresql.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/025-python3.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh b/coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/026-p7zip.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh b/coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-osx-10.11-x86_64/08-libclang.sh rename to coin/provisioning/qtci-osx-10.11-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/004-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/msvc.ps1 rename to coin/provisioning/qtci-windows-10-x86/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/005-wsearch-off.ps1 rename to coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/python3.ps1 b/coin/provisioning/qtci-windows-10-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/python3.ps1 rename to coin/provisioning/qtci-windows-10-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/icu.ps1 rename to coin/provisioning/qtci-windows-10-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 rename to coin/provisioning/qtci-windows-10-x86/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/60-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/jom.ps1 rename to coin/provisioning/qtci-windows-10-x86/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/cmake.ps1 rename to coin/provisioning/qtci-windows-10-x86/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/libusb.ps1 rename to coin/provisioning/qtci-windows-10-x86/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/004-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 b/coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/002-disable-sleep.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/02-disable-sleep.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/05-msvc.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/005-wsearch-off.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/python3.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 b/coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/009-openssl.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/icu.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/10-msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/030-fbx.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/30-fbx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 b/coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/030-qnx660.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/30-qnx660.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 b/coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/patch_qnx.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/jom.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/60-jom.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/cmake.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/70-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/3dstudio_3rdparty.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-3dstudio_3rdparty.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/mysql.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-mysql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/postgresql.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-postgresql.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/90-signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python3.ps1 b/coin/provisioning/qtci-windows-7-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/25-python3.ps1 rename to coin/provisioning/qtci-windows-7-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/12-icu.ps1 b/coin/provisioning/qtci-windows-7-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/12-icu.ps1 rename to coin/provisioning/qtci-windows-7-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 b/coin/provisioning/qtci-windows-7-x86/25-python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-7-x86/25-python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 rename to coin/provisioning/qtci-windows-7-x86/50-patch_qnx.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-7-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 deleted file mode 100644 index 41210dcb..00000000 --- a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/001-disable-uac.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/06-python.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/python3.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/msvc-2013-update5.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/openssl.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/009-set-network-test-server.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/icu.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/cmake.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/jom.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/90-install-notepad++.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/001-disable-uac.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/01-disable-uac.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/06-python.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/02-python.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/004-disable-windows-updates.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windows-updates.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/msvc-2013-update5.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-msvc-2013-update5.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/python3.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/08-python3.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/openssl.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/09-openssl.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/009-set-network-test-server.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/09-set-network-test-server.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/icu.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/10-icu.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/cmake.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/60-cmake.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/jom.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/70-jom.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/02-install-notepad++.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/90-install-notepad++.ps1 From 497fc75f1afbb95c6f8230d1fea082b8ea13b9ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 29 Dec 2017 10:40:24 +0200 Subject: [PATCH 15/22] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id3233e66cce60596a1523a8685ee593a8dec19f2 Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 44ef95a8..44da5b86 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 44ef95a885f440a33e79ff3f9a79d4bb6d408dda +Subproject commit 44da5b863597e761df3545dc7ff02a9b53bbb13d diff --git a/qtdeclarative b/qtdeclarative index 52bc4fbf..78a5add7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 52bc4fbfbae6aa1569dc134dd103e966f04bc2e6 +Subproject commit 78a5add79497300802c2152b5bf561b6bef305f1 diff --git a/qtdoc b/qtdoc index 0703849b..a83a49af 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0703849b6d6a63873fc9334d573b7ee85256c655 +Subproject commit a83a49aff24964803ddee737bd3b172ce3003290 diff --git a/qtquickcontrols b/qtquickcontrols index 8a0f0553..a60d3e0d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8a0f0553e4eb8468513bbb8ba45a9ec2bcd6ce68 +Subproject commit a60d3e0df7085d077aaed93d9243cf3d57b59464 From da3d21c0e6d33a2699417f907c1cf192634f6418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 2 Jan 2018 09:43:38 +0200 Subject: [PATCH 16/22] Fix the Tier1 image that qtbase builds qemu builds with Commit fcc0feaacb91ab5aefb212d351dcea7c728eefa5 forgot to update the Tier1 image in qtbase.txt. It only updated default.txt and qtdeclarative.txt. Most likely because qtbase.txt was added after initial changes were made and not caught in rebase. Task-number: QTQAINFRA-1574 Change-Id: If5da006172037c27dec5b3ae0b14330bc6f0149f Reviewed-by: Heikki Halmet --- coin/platform_configs/qtbase.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 3292cc6e..ee4f4e66 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -1,4 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild DisableTests -qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild DisableTests +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 From 6eee3f6cffc287ac3fdc44a580cd1baf9190d751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 1 Jan 2018 15:00:45 +0200 Subject: [PATCH 17/22] Add set -ex to 7z provisioning in RHEL 7.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If6323055999830954df6893d72ff2031b34f0276 Reviewed-by: Joni Jäntti Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index 966f3045..ffd1d8a7 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -32,6 +32,9 @@ ## $QT_END_LICENSE$ ## ############################################################################# + +set -ex + source "${BASH_SOURCE%/*}/../common/DownloadURL.sh" name="p7zip" From b9aae857f9e2dbcc444a099a8345dc8ac31ff47e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 29 Dec 2017 10:14:10 +0200 Subject: [PATCH 18/22] Fix shebangs and give provisioning scripts +x rights MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ib85721600b1e4461470a9ea4fd3b29fca0b35633 Reviewed-by: Simo Fält --- coin/provisioning/common/DownloadURL.sh | 2 +- .../provisioning/common/InstallAppFromCompressedFileFromURL.sh | 2 +- coin/provisioning/common/InstallFromCompressedFileFromURL.sh | 2 +- coin/provisioning/common/InstallPKGFromURL.sh | 2 +- coin/provisioning/common/android_linux.sh | 2 +- coin/provisioning/common/cmake.sh | 2 +- coin/provisioning/common/cmake_linux.sh | 2 +- coin/provisioning/common/disable_selinux.sh | 0 coin/provisioning/common/fbx_linux.sh | 2 +- coin/provisioning/common/fbx_macos.sh | 2 +- coin/provisioning/common/install-commandlinetools.sh | 2 +- coin/provisioning/common/install_xcode.sh | 2 +- coin/provisioning/common/integrity.sh | 2 +- coin/provisioning/common/openssl_for_android_linux.sh | 2 +- coin/provisioning/common/python3.sh | 2 +- coin/provisioning/common/qnx_700.sh | 2 +- coin/provisioning/common/system_updates.sh | 2 +- coin/provisioning/common/try_catch.sh | 2 +- coin/provisioning/common/version.sh | 2 +- .../05-subscription-manager-tooling.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 1 + coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh | 2 +- .../01-refresh-subscription-manager.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- .../provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh | 3 ++- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh | 2 +- .../qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh | 2 +- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh | 2 +- .../qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 3 ++- .../qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh | 3 ++- .../qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh | 2 +- .../qtci-macos-10.12-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh | 0 coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh | 2 +- coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh | 2 +- .../qtci-osx-10.10-x86_64/02-disable-screensaver.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh | 1 + coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh | 2 +- .../qtci-osx-10.11-x86_64/21-install-commandlinetools.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh | 1 + 79 files changed, 80 insertions(+), 69 deletions(-) mode change 100644 => 100755 coin/provisioning/common/DownloadURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallFromCompressedFileFromURL.sh mode change 100644 => 100755 coin/provisioning/common/InstallPKGFromURL.sh mode change 100644 => 100755 coin/provisioning/common/android_linux.sh mode change 100644 => 100755 coin/provisioning/common/disable_selinux.sh mode change 100644 => 100755 coin/provisioning/common/install-commandlinetools.sh mode change 100644 => 100755 coin/provisioning/common/openssl_for_android_linux.sh mode change 100644 => 100755 coin/provisioning/common/qnx_700.sh mode change 100644 => 100755 coin/provisioning/common/try_catch.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh mode change 100644 => 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh mode change 100644 => 100755 coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh mode change 100644 => 100755 coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh old mode 100644 new mode 100755 index c60fae21..cb890e8a --- a/coin/provisioning/common/DownloadURL.sh +++ b/coin/provisioning/common/DownloadURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh old mode 100644 new mode 100755 index 2af2db10..bb7f772f --- a/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallAppFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh old mode 100644 new mode 100755 index df84431a..fb77b714 --- a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/InstallPKGFromURL.sh b/coin/provisioning/common/InstallPKGFromURL.sh old mode 100644 new mode 100755 index c00b646c..bf834e5d --- a/coin/provisioning/common/InstallPKGFromURL.sh +++ b/coin/provisioning/common/InstallPKGFromURL.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh old mode 100644 new mode 100755 index 232326b7..3fa906e1 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh index e10dd41d..c727c8ff 100755 --- a/coin/provisioning/common/cmake.sh +++ b/coin/provisioning/common/cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/cmake_linux.sh b/coin/provisioning/common/cmake_linux.sh index 701d9081..35313d3c 100755 --- a/coin/provisioning/common/cmake_linux.sh +++ b/coin/provisioning/common/cmake_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/disable_selinux.sh b/coin/provisioning/common/disable_selinux.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/common/fbx_linux.sh b/coin/provisioning/common/fbx_linux.sh index 66d4793b..9827f9ab 100755 --- a/coin/provisioning/common/fbx_linux.sh +++ b/coin/provisioning/common/fbx_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/fbx_macos.sh b/coin/provisioning/common/fbx_macos.sh index 66a2d998..0f5e16a3 100755 --- a/coin/provisioning/common/fbx_macos.sh +++ b/coin/provisioning/common/fbx_macos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## ## Copyright (C) 2017 The Qt Company Ltd. diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh old mode 100644 new mode 100755 index f224d31d..876d0b9c --- a/coin/provisioning/common/install-commandlinetools.sh +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/install_xcode.sh b/coin/provisioning/common/install_xcode.sh index c6f00ee7..5d8009e3 100755 --- a/coin/provisioning/common/install_xcode.sh +++ b/coin/provisioning/common/install_xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/integrity.sh b/coin/provisioning/common/integrity.sh index 6998866a..6c96d9e0 100755 --- a/coin/provisioning/common/integrity.sh +++ b/coin/provisioning/common/integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/openssl_for_android_linux.sh b/coin/provisioning/common/openssl_for_android_linux.sh old mode 100644 new mode 100755 index 70684eaf..2ca38db9 --- a/coin/provisioning/common/openssl_for_android_linux.sh +++ b/coin/provisioning/common/openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/python3.sh b/coin/provisioning/common/python3.sh index 31591339..fc20aa2d 100755 --- a/coin/provisioning/common/python3.sh +++ b/coin/provisioning/common/python3.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/qnx_700.sh b/coin/provisioning/common/qnx_700.sh old mode 100644 new mode 100755 index 1f1c0f3f..73783468 --- a/coin/provisioning/common/qnx_700.sh +++ b/coin/provisioning/common/qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/system_updates.sh b/coin/provisioning/common/system_updates.sh index 2dee2708..0736d740 100755 --- a/coin/provisioning/common/system_updates.sh +++ b/coin/provisioning/common/system_updates.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh old mode 100644 new mode 100755 index b21861e3..560d040d --- a/coin/provisioning/common/try_catch.sh +++ b/coin/provisioning/common/try_catch.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/common/version.sh b/coin/provisioning/common/version.sh index e7662e1e..ed24d805 100755 --- a/coin/provisioning/common/version.sh +++ b/coin/provisioning/common/version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh old mode 100644 new mode 100755 index 59fd541f..d3072b37 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/05-subscription-manager-tooling.sh @@ -1,3 +1,4 @@ +#!/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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh old mode 100644 new mode 100755 index 4e4fb462..c8edc2a2 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/06-odbc.sh @@ -1,3 +1,4 @@ +#!/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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh old mode 100644 new mode 100755 index 43ba9ecd..552e7586 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-pythondev.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh old mode 100644 new mode 100755 index 5c88e498..00b57918 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex $(dirname $0)/../common/cmake_linux.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh old mode 100644 new mode 100755 index 1831ea52..b156e8f9 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/20-libusb.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash # Required for tqtc-boot2qt/qdb set -ex diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh old mode 100644 new mode 100755 index 03a69edb..e4492eb0 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh old mode 100644 new mode 100755 index 27c7137b..6f998a60 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/50-patch_qnx.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh old mode 100644 new mode 100755 index 836f6ec4..fb3e9642 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/99-version.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh index 2f7adf54..8b10ffd1 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-refresh-subscription-manager.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index f2caf274..1afe750b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh index 08c4371a..8f080992 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/02-enable-repos.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh index 5667058f..f3b90756 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/03-install-devtoolset.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh index 4565a843..60f5ad29 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install-packages.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh index ffd1d8a7..bb97d390 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-p7zip.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh index bd94aba9..7ce3d514 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/06-cmake.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh index 73591496..c415db3a 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/07-qnx_700.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh index b8c88dee..4f3f4205 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-integrity.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh index 40cb276a..d5fe88c7 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/08-pythondev.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh index e91cee9f..b3cca8f9 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/09-disable_selinux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh index af7d7c13..7ecc470d 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/10-openssl_for_android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh index bf9b64af..7e39935b 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-fbx.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex BASEDIR=$(dirname "$0") diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh index 9447c43f..ed9d6679 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/30-install_icu.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh index 5808a45c..19e41d46 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/40-android_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index c9484698..e541d83b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 7cc16024..acf92779 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh index 1382b279..b3fea7df 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh index b121d604..7e39935b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/30-fbx.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -ex diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index d01ed9e9..e5da6fe7 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex BASEDIR=$(dirname "$0") diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh index b8495402..0661fdb0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/02-zypperpackages.sh @@ -1,4 +1,5 @@ -#!/bin/bash +#!/usr/bin/env bash + set -ex sudo zypper -nq install git diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh old mode 100644 new mode 100755 index 51516380..92a8dd0b --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-pythondev.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash # provides: python development libraries # version: provided by default Linux distribution repository # needed to build pyside diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh index 01e1291c..b5f370ab 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/18-icc.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh index 7b1b967c..dceb3bcc 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh index 77c41533..8461c656 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/06-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh index 2cdedcf5..b68d62f8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/07-SSL_keychain.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh index 5171156c..6f5faee0 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh index 4c76f16a..39719bb8 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-java.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 72e521c5..f879d756 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index 352c8342..9801e99c 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh index 0ccd34f9..b37bb02d 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh index 3de6cc89..c9e9c842 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh index 0b15d557..9c754dbf 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/30-android.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-10.12-x86_64/30-fbx.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh index 9dd79862..503a4c07 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/35-openssl.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh index 49e087a8..e1a41835 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/55-signtools.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh old mode 100644 new mode 100755 index 77c41533..8461c656 --- a/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh old mode 100644 new mode 100755 index d5b2101e..e799344a --- a/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/02-disable-screensaver.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.10-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh index 77c41533..8461c656 100644 --- a/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-crashreporter.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh old mode 100644 new mode 100755 index a59e3e63..2c3e45f3 --- a/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/03-bashprofile.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh index 3e495a63..0e39a958 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/05-systemsetup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh index 2cdedcf5..b68d62f8 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/07-SSL_keychain.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env sh set -ex diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh index 61c7fc6d..314a0d24 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/15-xz.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh index 8ca4a3ac..779a525e 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/20-xcode.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh index 2f46c41d..a8f7cca1 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/21-install-commandlinetools.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh index 3e545d9e..17bb0df3 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-mysql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh index b7393895..f71225f5 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-postgresql.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh old mode 100644 new mode 100755 index 86bee612..b18e4923 --- a/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/25-python3.sh @@ -1,3 +1,4 @@ +#!/usr/bin/env bash set -ex source "${BASH_SOURCE%/*}/../common/python3.sh" From 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 29 Dec 2017 10:22:08 +0200 Subject: [PATCH 19/22] Set up proxy for provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1669 Change-Id: I582dc5037bd2b46dcd5c9c3b2cb13784e122d6a5 Reviewed-by: Simo Fält --- coin/provisioning/common/android_linux.sh | 10 +++- .../common/check_and_set_proxy.sh | 50 +++++++++++++++++++ coin/provisioning/common/http_proxy.txt | 2 + coin/provisioning/common/libclang.sh | 2 + .../01-systemsetup.sh | 42 ++++++++++++++++ .../01-systemsetup.sh | 5 ++ .../01-systemsetup.sh | 10 ++++ .../01-systemsetup.sh | 6 +++ .../99-unset-proxy.sh | 39 +++++++++++++++ 9 files changed, 165 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/common/check_and_set_proxy.sh create mode 100644 coin/provisioning/common/http_proxy.txt create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index 3fa906e1..c218ffe4 100755 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -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" @@ -84,8 +85,15 @@ try 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 diff --git a/coin/provisioning/common/check_and_set_proxy.sh b/coin/provisioning/common/check_and_set_proxy.sh new file mode 100755 index 00000000..8dad878c --- /dev/null +++ b/coin/provisioning/common/check_and_set_proxy.sh @@ -0,0 +1,50 @@ +#!/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%/*}/try_catch.sh" +source "${BASH_SOURCE%/*}/http_proxy.txt" + +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 + diff --git a/coin/provisioning/common/http_proxy.txt b/coin/provisioning/common/http_proxy.txt new file mode 100644 index 00000000..3aa6ceba --- /dev/null +++ b/coin/provisioning/common/http_proxy.txt @@ -0,0 +1,2 @@ +proxy="http://proxy.intra.qt.io:3128" + diff --git a/coin/provisioning/common/libclang.sh b/coin/provisioning/common/libclang.sh index 381127b1..ea33d62d 100755 --- a/coin/provisioning/common/libclang.sh +++ b/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 diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..945d2e99 --- /dev/null +++ b/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 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh index 1afe750b..52ac3d6c 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh @@ -37,6 +37,7 @@ 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 diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index e541d83b..b44c3014 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -40,6 +40,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/try_catch.sh" +source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" NTS_IP=10.212.2.216 @@ -47,6 +48,7 @@ ExceptionGsettings1=100 ExceptionGsettings2=101 ExceptionGsettings3=102 ExceptionNTS=103 +ExceptionProxy=104 try ( @@ -59,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 @@ -78,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 } diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh index e5da6fe7..eeb98b70 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh @@ -4,6 +4,7 @@ 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 @@ -12,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 + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/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 + From a742af96fb2b09870a02b0ef33bfed9949bc44ba Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 3 Jan 2018 15:03:19 +0200 Subject: [PATCH 20/22] Provisioning: Ubuntu16.04 - CMake CMake is missing from the clean installed Ubuntu 16.04. Change-Id: I965bc3e55eb9b0765f483a84e5584e61054bdd80 Reviewed-by: Heikki Halmet Reviewed-by: Jani Heikkinen --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/40-cmake.sh new file mode 100755 index 00000000..ddfc88a6 --- /dev/null +++ b/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 + From 82a6a9347f32388b41b3655194cb08afd7cdf359 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Fri, 5 Jan 2018 09:17:50 +0200 Subject: [PATCH 21/22] Provisioning: Ubuntu 16.04 - Set timezone to UTC Task-number: QTBUG-65435 Change-Id: I329926d0f83d47c9e69eee177c600ac629ee9415 Reviewed-by: Heikki Halmet --- .../qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index b44c3014..f245c90c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -52,6 +52,8 @@ ExceptionProxy=104 try ( + echo "Set timezone to UTC" || throw $ExceptionTimezone + sudo timedatectl set-timezone Etc/UTC echo "Timeout for blanking the screen (0 = never)" gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 echo "Prevents screen lock when screesaver goes active." @@ -68,6 +70,10 @@ try ) catch || { case $ex_code in + $ExceptionTimezone) + echo "Failed to set timezone to UTC" + exit 1; + ;; $ExceptionGsettings1) echo "Failed to disable black screen." exit 1; From b9b259fd405be7f208851369d0be2f40f90662be Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 5 Jan 2018 12:35:14 +0100 Subject: [PATCH 22/22] Update submodules on '5.9' in qt5 Change-Id: I95a01ff67b3d16a9a989e3b714f82c94a92d6dc4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qtbase b/qtbase index 44da5b86..175d691f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 44da5b863597e761df3545dc7ff02a9b53bbb13d +Subproject commit 175d691fa377d43fbc18d52d116135e0bf76a5f4 diff --git a/qtconnectivity b/qtconnectivity index e46cde93..5a67821b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e46cde935ee76eaa00e78af968121502e2406347 +Subproject commit 5a67821b9615b5fc17cab405566a81cc7f554ad4 diff --git a/qtdeclarative b/qtdeclarative index 78a5add7..529b4484 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 78a5add79497300802c2152b5bf561b6bef305f1 +Subproject commit 529b4484e558376598b5bf12a3cfae6fd3969827 diff --git a/qtlocation b/qtlocation index 7508f021..844e0e4a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7508f02176f317db50f20985205bf64af8134ab6 +Subproject commit 844e0e4aec3285ec5cfde90422acd796bc4d7d39 diff --git a/qtmultimedia b/qtmultimedia index c8bf0cd3..13df2988 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c8bf0cd37c5f526e3687dfeff9e23d15104328b5 +Subproject commit 13df2988efbe9a82225ccbf4cad463391d94c8e8 diff --git a/qtquickcontrols b/qtquickcontrols index a60d3e0d..4397b10d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a60d3e0df7085d077aaed93d9243cf3d57b59464 +Subproject commit 4397b10d7fee0e1183141942fde8af2d0382794d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 31a65540..aa9308d1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 31a655402ff194e556853e6877f1a464a8e51243 +Subproject commit aa9308d1d172a51a3e4356b8831b9f28fc68086e diff --git a/qtserialbus b/qtserialbus index 50aea4ad..8ff62bd9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 50aea4ada4521f009ea8524b91daea1fac283c41 +Subproject commit 8ff62bd9536b5539e1e6b393c4ec87b092e36621 diff --git a/qttools b/qttools index 2f3dc790..1a60dc75 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2f3dc790aefadc74debfa25efe958078def34146 +Subproject commit 1a60dc756f35b3b19a444c976dcb547f51c30d76 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cb5fab80..a15a5af7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cb5fab803f3227f4c678a6a694d907fc385c7b05 +Subproject commit a15a5af71c1ff0e92a51a856391b546ca9fc23b8 diff --git a/qtwayland b/qtwayland index 154bdf45..a25c1861 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 154bdf45dd51a521058c820e7b871008ce8508ae +Subproject commit a25c186126fe37a0e5e12e2d12865ed27eb1f4e8 diff --git a/qtwebengine b/qtwebengine index 17ecc4e7..6f242a93 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 17ecc4e7e0c88d891e1b18d5810a7ac2fd0b83ba +Subproject commit 6f242a9389369242b23a61dcb59fc610dc27bb05 diff --git a/qtwebview b/qtwebview index 4d4b118c..a14f37e7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4d4b118c1294d96741d71a775ac1c57b5acb96bb +Subproject commit a14f37e76b429876015ee96cc4adb97ed4c9fbed