From 09ec29421071c0b72a07f5b9f9c620cfc53eafd6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Jan 2018 23:27:00 +0100 Subject: Update submodules on '5.9' in qt5 Change-Id: Iaadacb41390a5b028d99d4427895af6529b13b59 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 957c1d9a..e211ab76 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 957c1d9abd854a3b5c43ace807ab7cbf89c91491 +Subproject commit e211ab76d766878b4dbe88901b9a7a4a70ce7332 diff --git a/qtconnectivity b/qtconnectivity index 8cece5f6..b5e90f9e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8cece5f6e09010de4bebd1a2ef524e2ca55d8a5b +Subproject commit b5e90f9e554997254fb54255339578e92234d5bb diff --git a/qtdeclarative b/qtdeclarative index 706a6647..421a1c5c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 706a6647db695cdeb854ef1bf956ded56b498f78 +Subproject commit 421a1c5cae9cd17a3fefb6133b0727b29f456eff diff --git a/qtquickcontrols b/qtquickcontrols index 38414f92..eb048e48 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 38414f9262aebe9e77dcb181a1672d2e929fbb48 +Subproject commit eb048e486daa3644476fdec5b0bd016b1729fc01 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d64774ad..ffda6894 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d64774add9fafa24406a202d0313e10780e1e715 +Subproject commit ffda6894cc80909f900447d4de24bcc0effd467b diff --git a/qtwebengine b/qtwebengine index 04337275..f2d93896 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 04337275e4b66ba5853c24a79d7f61ebb2e7a247 +Subproject commit f2d938962fe9a029ec0baf37ca7f478051125780 -- cgit v1.2.3 From 7681e742d701d6167484ece5fb6fcd33ba5202ff Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Jan 2018 14:10:33 +0100 Subject: Update submodules on '5.9' in qt5 Change-Id: Ie34e726ef71d33bb0726a10886edd3153783376a Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 387dde19..7c8410c6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 387dde19d2cfc349d8fe9b5775078798d99fc144 +Subproject commit 7c8410c6dc325902160bb433044800ba02d44d12 diff --git a/qtbase b/qtbase index e211ab76..342bb5b0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e211ab76d766878b4dbe88901b9a7a4a70ce7332 +Subproject commit 342bb5b03a76d1428fafb8e1532d66e172bd1c0b diff --git a/qtconnectivity b/qtconnectivity index b5e90f9e..dd2e19ca 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b5e90f9e554997254fb54255339578e92234d5bb +Subproject commit dd2e19ca327a3f7a49c40b61c483ec60dcaafa90 diff --git a/qtdeclarative b/qtdeclarative index 421a1c5c..388f9b15 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 421a1c5cae9cd17a3fefb6133b0727b29f456eff +Subproject commit 388f9b151245ae194a0a9175da7cc70ce534e6e6 diff --git a/qtdoc b/qtdoc index efb7c673..b5d003d0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit efb7c673cda85f7de1941e4fbf8e6cc4ad290a2d +Subproject commit b5d003d00c114a6824ef45bee027a72e309fc009 diff --git a/qtlocation b/qtlocation index 765ec408..68b5ee9e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 765ec408b3b355b37c04f52dc6c477e3dca3e3f8 +Subproject commit 68b5ee9e7064f66fd7e7bd69b4b51229dbe8cc3c diff --git a/qtmultimedia b/qtmultimedia index 7638848d..f4ed0d41 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7638848d2486e2fac9764b60a99de08f50adc8eb +Subproject commit f4ed0d4178ecdf50cdaca47716a5101a28494157 diff --git a/qtqa b/qtqa index 1cf3a72d..0d050f36 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1cf3a72de0bbd50bdfad0cd2cd21d430f1f6ebb9 +Subproject commit 0d050f36dc74adc3a7e29b1d51ccf55027d9c522 diff --git a/qtquickcontrols b/qtquickcontrols index eb048e48..a8438846 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit eb048e486daa3644476fdec5b0bd016b1729fc01 +Subproject commit a843884697602891d21b9f9bc62603548dd6a6b8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ffda6894..c3858bd5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ffda6894cc80909f900447d4de24bcc0effd467b +Subproject commit c3858bd53974e486e03537d1937deb0020828556 diff --git a/qttools b/qttools index 47689d48..f1233878 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 47689d484a6254c2eef3ee382ea5e2775a020c0f +Subproject commit f1233878fef715c0746dcb6af7164acfb46fd418 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e078c5e2..34123d6d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e078c5e237142270f5d85a22a1e8adc969668695 +Subproject commit 34123d6db47e213a66e855d8895030a2a5979c0b diff --git a/qtwayland b/qtwayland index 6793a0a9..8ce0185c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 6793a0a907f3aa92f8f8bd5448505c152d0e3a3d +Subproject commit 8ce0185c92a8914b54eb12c8be1ce1c873befa55 -- cgit v1.2.3 From 6d1190aaa0d6c258f159e50d4aa3073b3e7f105f Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Wed, 24 Jan 2018 10:48:07 +0200 Subject: Provisioning: Use SetEnvVar helper function in scripts Currently when adding an environment variable in provisioning we have to check if the system is Ubuntu and use .profile instead of .bashrc. This check should be done in a function so we don't have to duplicate it for every provisioning script separately. Change-Id: I2fa128032123e17d20dfb39cd3668e22e4bb0d55 Reviewed-by: Maurice Kalinowski Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/android_linux.sh | 9 ++-- coin/provisioning/common/linux/cmake_linux.sh | 8 +--- coin/provisioning/common/linux/fbx_linux.sh | 4 +- coin/provisioning/common/linux/integrity.sh | 11 ++--- .../common/linux/openssl_for_android_linux.sh | 4 +- coin/provisioning/common/linux/qnx_700.sh | 8 +++- coin/provisioning/common/macos/cmake.sh | 5 ++- coin/provisioning/common/macos/fbx_macos.sh | 5 ++- coin/provisioning/common/macos/python3.sh | 6 ++- coin/provisioning/common/unix/SetEnvVar.sh | 51 ++++++++++++++++++++++ .../qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh | 5 ++- .../qtci-linux-Ubuntu-16.04-x86_64/04-yocto.sh | 9 ++-- .../qtci-macos-10.12-x86_64/07-SSL_keychain.sh | 5 ++- .../qtci-macos-10.12-x86_64/25-mysql.sh | 4 +- .../qtci-macos-10.12-x86_64/25-postgresql.sh | 4 +- .../qtci-macos-10.12-x86_64/30-android.sh | 10 +++-- .../qtci-macos-10.12-x86_64/35-openssl.sh | 6 ++- .../qtci-osx-10.11-x86_64/07-SSL_keychain.sh | 8 +++- .../provisioning/qtci-osx-10.11-x86_64/25-mysql.sh | 5 ++- .../qtci-osx-10.11-x86_64/25-postgresql.sh | 5 ++- 20 files changed, 130 insertions(+), 42 deletions(-) create mode 100755 coin/provisioning/common/unix/SetEnvVar.sh diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index b4a412c8..76db19d4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -40,6 +40,7 @@ source "${BASH_SOURCE%/*}/../unix/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" @@ -95,10 +96,10 @@ try 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 - echo "export ANDROID_NDK_HOST=linux-x86_64" >> ~/.bashrc - echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc + SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" + SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" + SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" + SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 27358a20..98af57c8 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -39,6 +39,7 @@ # shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="3.6.2" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" @@ -49,9 +50,4 @@ appPrefix="cmake-$version-Linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" -echo "Adding $targetFolder/bin to PATH" -if uname -a |grep -q "Ubuntu"; then - echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.profile -else - echo "export PATH=$targetFolder/bin:\$PATH" >> ~/.bashrc -fi +SetEnvVar "PATH" "$targetFolder/bin:\$PATH" diff --git a/coin/provisioning/common/linux/fbx_linux.sh b/coin/provisioning/common/linux/fbx_linux.sh index 0b587aed..a6c00f61 100755 --- a/coin/provisioning/common/linux/fbx_linux.sh +++ b/coin/provisioning/common/linux/fbx_linux.sh @@ -35,7 +35,7 @@ # This script installs FBX SDK source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -#s script installs FBX SDK +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" set -e tarballName="fbx20161_2_fbxsdk_linux.tar.gz" @@ -56,7 +56,7 @@ sudo mkdir -p $targetFolder rm -rf "$targetFile" # Set env variables -echo "export FBXSDK=$targetFolder" >> ~/.profile +SetEnvVar "FBXSDK" "$targetFolder" echo "FBX SDK = 2016.1.2" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/integrity.sh b/coin/provisioning/common/linux/integrity.sh index 0c7234b3..e291358d 100755 --- a/coin/provisioning/common/linux/integrity.sh +++ b/coin/provisioning/common/linux/integrity.sh @@ -36,6 +36,7 @@ # This script installs INTEGRITY source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="11.4.4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" @@ -46,10 +47,10 @@ appPrefix="" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" -echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc -echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc -echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc -echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc -echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc +SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9" +SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654" +SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144" +SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" +SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante" echo "INTEGRITY = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/openssl_for_android_linux.sh b/coin/provisioning/common/linux/openssl_for_android_linux.sh index cda41d72..e9f50b87 100755 --- a/coin/provisioning/common/linux/openssl_for_android_linux.sh +++ b/coin/provisioning/common/linux/openssl_for_android_linux.sh @@ -38,6 +38,7 @@ source "${BASH_SOURCE%/*}/../unix/try_catch.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="1.0.2g" officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" @@ -64,7 +65,8 @@ try pushd "$opensslHome" perl Configure shared android || throw $ExceptionConfig - echo "export OPENSSL_ANDROID_HOME=$opensslHome" >> ~/.bashrc + SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome" + echo "OpenSSL for Android = $version" >> ~/versions.txt ) catch || { diff --git a/coin/provisioning/common/linux/qnx_700.sh b/coin/provisioning/common/linux/qnx_700.sh index 73783468..5901b634 100755 --- a/coin/provisioning/common/linux/qnx_700.sh +++ b/coin/provisioning/common/linux/qnx_700.sh @@ -36,6 +36,9 @@ # This script installs QNX 7. set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + targetFolder="/opt/" sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.tar.xz" sha1="949a87c5f00d0756956cb4b1b3b213ecaeee9113" @@ -44,7 +47,7 @@ targetFile="qnx700.tar.xz" wget --tries=5 --waitretry=5 --output-document="$targetFile" "$sourceFile" echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then - mkdir -p $targetFolder + mkdir -p $targetFolder fi sudo tar -C $targetFolder -Jxf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" @@ -57,5 +60,6 @@ fi rm -rf $targetFile # Set env variables -echo "export QNX_700=$targetFolder$folderName" >> ~/.bashrc +SetEnvVar "QNX_700" "$targetFolder$folderName" + echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index c727c8ff..f926de89 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -39,6 +39,8 @@ # shellcheck source=./InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" @@ -47,5 +49,6 @@ appPrefix="cmake-3.6.2-Darwin-x86_64" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export PATH=/Applications/CMake.app/Contents/bin:\$PATH" >> ~/.bashrc +SetEnvVar "PATH" "/Applications/CMake.app/Contents/bin:\$PATH" + echo "CMake = 3.6.2" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/fbx_macos.sh b/coin/provisioning/common/macos/fbx_macos.sh index 9dc97814..b2ec8154 100755 --- a/coin/provisioning/common/macos/fbx_macos.sh +++ b/coin/provisioning/common/macos/fbx_macos.sh @@ -36,6 +36,8 @@ # shellcheck source=./../unix/try_catch.sh source "${BASH_SOURCE%/*}/../unix/try_catch.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" fileName="fbx20161_2_fbxsdk_clang_mac.pkg.tgz" targetFolder="/opt/fbx" @@ -74,6 +76,7 @@ echo "Running installer for '$installer'" sudo installer -pkg "$installer" -target "/" # Set env variables -echo "export FBXSDK=/Applications/Autodesk/FBX\ SDK/2016.1.2/" >> ~/.bashrc +SetEnvVar "FBXSDK" "/Applications/Autodesk/FBX\ SDK/2016.1.2/" + echo "FBX SDK = 2016.1.2" >> ~/versions.txt diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index fc20aa2d..f38ab5e6 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -37,6 +37,7 @@ # This script installs python3 source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-3.6.1-macosx10.6.pkg" AltUrl="https://www.python.org/ftp/python/3.6.1/python-3.6.1-macosx10.6.pkg" @@ -47,6 +48,7 @@ InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" /Library/Frameworks/Python.framework/Versions/3.6/bin/pip3 install virtualenv -echo "export PYTHON3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc -echo "export PIP3_PATH=/Library/Frameworks/Python.framework/Versions/3.6/bin" >> ~/.bashrc +SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" +SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.6/bin" + echo "python3 = 3.6.1" >> ~/versions.txt diff --git a/coin/provisioning/common/unix/SetEnvVar.sh b/coin/provisioning/common/unix/SetEnvVar.sh new file mode 100755 index 00000000..e1b69169 --- /dev/null +++ b/coin/provisioning/common/unix/SetEnvVar.sh @@ -0,0 +1,51 @@ +#!/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$ +## +############################################################################# + +# A helper script used for setting environment variables on Unix systems + +set -ex + +function SetEnvVar { + name=$1 + path=$2 + + echo "Setting environment variable $name to $path." + + if uname -a |grep -q "Ubuntu"; then + echo "export $name=$path" >> ~/.profile + else + echo "export $name=$path" >> ~/.bashrc + fi +} diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh index 74ef2b4e..9ff1ec6c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/03-qemu.sh @@ -33,6 +33,9 @@ ############################################################################# set -ex + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # build latest qemu to usermode sudo apt-get -y install automake autoconf libtool @@ -91,4 +94,4 @@ sed $QEMU_FONTCONFFILE -e "s:/usr/share/fonts:$QEMU_FONTCONFPATH/fonts:" -i sed $QEMU_FONTCONFFILE -e "s:/usr/local/share/fonts:$QEMU_FONTCONFPATH/local_fonts:" -i # Set QEMU font configuration variables -echo "export QEMU_SET_ENV=\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" >> ~/.profile +SetEnvVar "QEMU_SET_ENV" "\"FONTCONFIG_FILE=$QEMU_FONTCONFFILE,FONTCONFIG_PATH=$QEMU_FONTCONFPATH\"" 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 ddb1d3dc..c792d8b5 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 @@ -38,6 +38,7 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt..." @@ -76,10 +77,10 @@ chmod +x "$yoctoInstaller" rm -rf "$yoctoInstaller" if [ -e "$yoctoLocationARMv7/$sysrootARMv7" -a -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" -a -e "$yoctoLocationARM64/$sysrootARM64" -a -e "$yoctoLocationARM64/${crosscompileARM64}g++" ]; then - echo "export QEMUARMV7_TOOLCHAIN_SYSROOT=$yoctoLocationARMv7/$sysrootARMv7" >> ~/.profile - echo "export QEMUARMV7_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARMv7/$crosscompileARMv7" >> ~/.profile - echo "export QEMUARM64_TOOLCHAIN_SYSROOT=$yoctoLocationARM64/$sysrootARM64" >> ~/.profile - echo "export QEMUARM64_TOOLCHAIN_CROSS_COMPILE=$yoctoLocationARM64/$crosscompileARM64" >> ~/.profile + SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/$sysrootARMv7" + SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" + SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/$sysrootARM64" + SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" else echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 exit 1 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 b68d62f8..6e7c796a 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 @@ -2,5 +2,8 @@ set -ex +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # Enables the usage of temporary keychains for SSL autotests -echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" 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 b47f9705..a28e306f 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 @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" @@ -52,5 +54,5 @@ sudo mkdir -p "/opt" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" -echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" echo "MySQL = 5.7.15" >> ~/versions.txt 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 8f3f85ec..9f79c594 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 @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" psqlVersion="9.6.0" @@ -51,5 +53,5 @@ appPrefix="" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc +SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" echo "PostgreSQL = $psqlVersion" >> ~/versions.txt 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 b6e731f2..a46cb335 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 @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/unix/try_catch.sh source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" targetFolder="/opt/android" sdkTargetFolder="$targetFolder/sdk" @@ -81,10 +83,10 @@ try echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager - echo "export ANDROID_SDK_HOME=$sdkTargetFolder" >> ~/.bashrc - echo "export ANDROID_NDK_HOME=$targetFolder/android-ndk-$ndkVersion" >> ~/.bashrc - echo "export ANDROID_NDK_HOST=darwin-x86_64" >> ~/.bashrc - echo "export ANDROID_API_VERSION=$sdkApiLevel" >> ~/.bashrc + SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" + SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" + SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" + SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" echo "Android SDK tools = $toolsVersion" >> ~/versions.txt echo "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt 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 ccff42c3..c169799b 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 @@ -41,6 +41,8 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" # shellcheck source=../common/unix/InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" opensslVersion="1.0.2k" opensslFile="openssl-$opensslVersion.tar.gz" @@ -75,8 +77,8 @@ try sudo mkdir -p "$path" sudo ln -s /usr/local/openssl-$opensslVersion $opensslTargetLocation || throw $ExceptionLN - echo "export PATH=\"$opensslTargetLocation/bin:\$PATH\"" >> ~/.bashrc - echo "export MANPATH=\"$opensslTargetLocation/share/man:\$MANPATH\"" >> ~/.bashrc + SetEnvVar "PATH" "\"$opensslTargetLocation/bin:\$PATH\"" + SetEnvVar "MANPATH" "\"$opensslTargetLocation/share/man:\$MANPATH\"" security find-certificate -a -p /Library/Keychains/System.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain | sudo tee -a $opensslTargetLocation/ssl/cert.pem || throw $ExceptionCertificate 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 b68d62f8..610f7a8e 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,6 +1,10 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash set -ex +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + # Enables the usage of temporary keychains for SSL autotests -echo "export QT_SSL_USE_TEMPORARY_KEYCHAIN=1" >> ~/.bashrc +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" + 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 89534baf..1908c79b 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 @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/mysql-5.7.15-osx10.11-x86_64.tar.gz" AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" @@ -52,6 +54,7 @@ sudo mkdir -p "/opt" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" -echo "export MYSQLBINPATH=/opt/mysql57/bin" >> ~/.bashrc +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" + echo "MySQL = 5.7.15" >> ~/versions.txt 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 8d88630b..7fedb4a2 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 @@ -41,6 +41,8 @@ set -ex # shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/Postgres-9.6.0.zip" AltUrl="https://github.com/PostgresApp/PostgresApp/releases/download/9.6.0/Postgres-9.6.0.zip" @@ -49,6 +51,7 @@ appPrefix="" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -echo "export POSTGRESQLBINPATH=/Applications/Postgres.app/Contents/Versions/9.6/bin" >> ~/.bashrc +SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" + echo "PostgreSQL = 9.6.0" >> ~/versions.txt -- cgit v1.2.3 From c4cf4fa07fc435595bfeb5004568d0709cf43bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 18 Jan 2018 12:09:00 +0200 Subject: Add nfs-common for mounting to work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-1690 Change-Id: I43453da3267664c664e80510e3750d1906d00078 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) 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 b81162d5..d15e0059 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 @@ -56,6 +56,8 @@ try installPackages+=(git) # 7zip is a needed decompressing tool installPackages+=(p7zip-full) + # To be able to mount yocto-cache during builds + installPackages+=(nfs-common) # 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 -- cgit v1.2.3 From dc5f851e787821733bc67c4a0328bc3db17be775 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 19 Jan 2018 10:20:04 +0200 Subject: Provisioning: Add common shared folder MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Common shared folder includes scripts of files which are common for all operating system families. Changes under shared folder will trigger provisioning for all platforms Change-Id: I0789f87b76876d5f92673fe2f0e72d770e5f5ea4 Task-number: QTQAINFRA-1451 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/network_test_server_ip.txt | 1 - coin/provisioning/common/shared/network_test_server_ip.txt | 1 + coin/provisioning/common/shared/sw_versions.txt | 1 + coin/provisioning/common/sw_versions.txt | 1 - coin/provisioning/common/unix/libclang.sh | 2 +- coin/provisioning/common/windows/libclang.ps1 | 2 +- coin/provisioning/common/windows/set-network-test-server.ps1 | 2 +- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-systemsetup.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- 12 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 coin/provisioning/common/network_test_server_ip.txt create mode 100644 coin/provisioning/common/shared/network_test_server_ip.txt create mode 100644 coin/provisioning/common/shared/sw_versions.txt delete mode 100644 coin/provisioning/common/sw_versions.txt diff --git a/coin/provisioning/common/network_test_server_ip.txt b/coin/provisioning/common/network_test_server_ip.txt deleted file mode 100644 index ec3d058a..00000000 --- a/coin/provisioning/common/network_test_server_ip.txt +++ /dev/null @@ -1 +0,0 @@ -network_test_server_ip=10.212.2.216 diff --git a/coin/provisioning/common/shared/network_test_server_ip.txt b/coin/provisioning/common/shared/network_test_server_ip.txt new file mode 100644 index 00000000..ec3d058a --- /dev/null +++ b/coin/provisioning/common/shared/network_test_server_ip.txt @@ -0,0 +1 @@ +network_test_server_ip=10.212.2.216 diff --git a/coin/provisioning/common/shared/sw_versions.txt b/coin/provisioning/common/shared/sw_versions.txt new file mode 100644 index 00000000..cc165dd5 --- /dev/null +++ b/coin/provisioning/common/shared/sw_versions.txt @@ -0,0 +1 @@ +libclang_version="4.0" diff --git a/coin/provisioning/common/sw_versions.txt b/coin/provisioning/common/sw_versions.txt deleted file mode 100644 index cc165dd5..00000000 --- a/coin/provisioning/common/sw_versions.txt +++ /dev/null @@ -1 +0,0 @@ -libclang_version="4.0" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 69d9ff96..d59c9fa2 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -43,7 +43,7 @@ set -e source "${BASH_SOURCE%/*}/check_and_set_proxy.sh" BASEDIR=$(dirname "$0") -. $BASEDIR/../sw_versions.txt +. $BASEDIR/../shared/sw_versions.txt url=$1 sha1=$2 version=$3 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 9d857051..208d1ed4 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -4,7 +4,7 @@ param([Int32]$archVer=32) # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. -Get-Content "$PSScriptRoot\..\sw_versions.txt" | Foreach-Object { +Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { $var = $_.Split('=') New-Variable -Name $var[0] -Value $var[1] $libclang_version = $libclang_version -replace '["."]' diff --git a/coin/provisioning/common/windows/set-network-test-server.ps1 b/coin/provisioning/common/windows/set-network-test-server.ps1 index 69059a2a..e6e92d48 100644 --- a/coin/provisioning/common/windows/set-network-test-server.ps1 +++ b/coin/provisioning/common/windows/set-network-test-server.ps1 @@ -35,7 +35,7 @@ # This script will set the network test server IP in to hosts file -$n = Get-Content "$PSScriptRoot\..\network_test_server_ip.txt" +$n = Get-Content "$PSScriptRoot\..\shared\network_test_server_ip.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] 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 b418ed8b..fb5a81b3 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 @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt +. $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" 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 f8847e51..a7718d96 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,7 +37,7 @@ set -ex BASEDIR=$(dirname "$0") source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" -source $BASEDIR/../common/network_test_server_ip.txt +source $BASEDIR/../common/shared/network_test_server_ip.txt 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 diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index fa8d3a44..49d4d4f5 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -2,7 +2,7 @@ set -ex BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt +. $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" 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 f419b7c1..4ebc1b44 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 @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -source $BASEDIR/../common/network_test_server_ip.txt +source $BASEDIR/../common/shared/network_test_server_ip.txt source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc 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 65d3ad4b..b4155e86 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 @@ -3,7 +3,7 @@ set -ex BASEDIR=$(dirname "$0") -. $BASEDIR/../common/sw_versions.txt +. $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" -- cgit v1.2.3 From 462a2aae2b8ba298d893ba52d16c1b13435f04ff Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 24 Apr 2017 12:31:38 +0300 Subject: Provisioning: Add Squish provisioning for Release Test Automation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish is required by RTA for testing. Task-number: QTQAINFRA-1523 Change-Id: I0c3653565f19cc9b798a0b63325c47b017cf5537 Reviewed-by: Joni Jäntti Reviewed-by: Matti Paaso --- coin/provisioning/common/unix/squishInstall.sh | 211 +++++++++++++++++++++ coin/provisioning/common/windows/helpers.ps1 | 16 ++ coin/provisioning/common/windows/squishInstall.ps1 | 163 ++++++++++++++++ .../qtci-linux-RHEL-7.4-x86_64/90-squish.sh | 4 + .../qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh | 4 + .../qtci-linux-openSUSE-42.3-x86_64/90-squish.sh | 4 + .../qtci-macos-10.12-x86_64/90-squish.sh | 4 + .../qtci-osx-10.10-x86_64/90-squish.sh | 4 + .../qtci-osx-10.11-x86_64/90-squish.sh | 4 + .../provisioning/qtci-windows-10-x86/90-squish.ps1 | 1 + .../qtci-windows-10-x86_64/90-squish.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/90-squish.ps1 | 1 + .../qtci-windows-8.1-x86/90-squish.ps1 | 1 + .../qtci-windows-8.1-x86_64/90-squish.ps1 | 1 + 14 files changed, 419 insertions(+) create mode 100755 coin/provisioning/common/unix/squishInstall.sh create mode 100644 coin/provisioning/common/windows/squishInstall.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/90-squish.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/90-squish.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/90-squish.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh new file mode 100755 index 00000000..e2553fcf --- /dev/null +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -0,0 +1,211 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +source "${BASH_SOURCE%/*}/try_catch.sh" + +set -ex + +# This script will install squish package for Linux and Mac. +# Squish is need by Release Test Automation (RTA) + +version="6.3.0" +# Branch version without dot +qtBranch="59x" +squishFolder="/opt/squish" +squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" +squishFile="squish-$version-qt$qtBranch-linux64.run" +if uname -a |grep -q Darwin; then + squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" +fi + +squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" +squishLicenseFile=".squish-3-license.tar.gz" + +# These checks can be removed when Vanilla OS for all linux and Mac are in +if [ -d "$squishFolder" ]; then + echo "Move old squish to /tmp" + sudo mv "$squishFolder" "/tmp/squish_$(date)" +fi + +if [ -f "/etc/profile.d/squish_env.sh" ]; then + echo "Remove /etc/profile.d/squish_env.sh" + sudo rm -f "/etc/profile.d/squish_env.sh" + export SQUISH_LICENSEKEY_DIR=$HOME +fi + +ExceptionMount=100 +ExceptionCreateFolder=101 +ExceptionUncompress=102 +ExceptionUnknownFormat=103 +ExceptionCopy=104 +ExceptionUmount=105 +ExceptionHdiutilAttach=106 +ExceptionInstallSquish=107 +ExceptionChangeOwnership=108 + +function MountAndInstall { + + url=$1 + targetDirectory=$2 + targetFile=$3 + + # Check which platform + if uname -a |grep -q Darwin; then + usersGroup="staff" + mountFolder="/Volumes" + squishLicenseDir="/Users/qt" + elif uname -a |grep -q "el6\|el7"; then + usersGroup="qt" + mountFolder="/tmp" + squishLicenseDir="/root" + elif uname -a |grep -q "Ubuntu"; then + usersGroup="users" + mountFolder="/tmp" + squishLicenseDir="/home/qt" + else + usersGroup="users" + mountFolder="/tmp" + squishLicenseDir="/root" + fi + + targetFileMount="$mountFolder"/"$targetFile" + + try + ( + echo "Mounting $url to $mountFolder" + sudo mount "$url" $mountFolder || throw $ExceptionMount + echo "Create $targetDirectory if needed" + if [ ! -d "/opt" ]; then + sudo mkdir "/opt" || throw $ExceptionCreateFolder + fi + if [ ! -d "$targetDirectory" ]; then + sudo mkdir "$targetDirectory" || throw $ExceptionCreateFolder + fi + echo "Uncompress $targetFile" + if [[ $targetFile == *.tar.gz ]]; then + if [[ $targetFile == .squish-3-license.* ]]; then + target="$squishLicenseDir" + # Squish license need to be exists also in users home directory, because squish check it before it starts running tests + sudo tar -xzf "$targetFileMount" --directory "$HOME" || throw $ExceptionUncompress + else + target="$targetDirectory" + fi + sudo tar -xzf "$targetFileMount" --directory "$target" || throw $ExceptionUncompress + echo "Unmounting $mountFolder" + sudo umount $mountFolder || throw $ExceptionUmount + elif [[ $targetFile == *.dmg ]]; then + echo "'dmg-file', no need to uncompress" + sudo cp $targetFileMount /tmp || throw $ExceptionCopy + sudo umount $mountFolder || throw $ExceptionUmount + sudo hdiutil attach "/tmp/$targetFile" || throw $ExceptionHdiutilAttach + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" || throw $ExceptionInstallSquish + sudo hdiutil unmount /Volumes/froglogic\ Squish/ + elif [[ $targetFile == *.run ]]; then + echo "'run-file', no need to uncompress" + sudo cp $targetFileMount $targetDirectory || throw $ExceptionCopy + sudo umount $mountFolder || throw $ExceptionUmount + sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 || throw $ExceptionInstallSquish + sudo rm -fr "$targetDirectory/$targetFile" + if uname -a |grep -q "Ubuntu"; then + sudo mkdir /usr/lib/tcl8.6 || throw $ExceptionCreateFolder + sudo cp "$targetDirectory/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ || throw $ExceptionCopy + fi + else + throw $ExceptionUnknownFormat + fi + + echo "Changing ownerships" + sudo chown -R qt:$usersGroup "$targetDirectory" || throw $ExceptionChangeOwnership + sudo chown qt:$usersGroup "$HOME/.squish-3-license" + + ) + + catch || { + case $ex_code in + $ExceptionMount) + echo "Failed to mount $url to $mountFolder." + exit 1; + ;; + $ExceptionCreateFolder) + echo "Failed to create folder" + exit 1; + ;; + $ExceptionUncompress) + echo "Failed extracting compressed file." + exit 1; + ;; + $ExceptionUnknownFormat) + echo "Unknown file format." + exit 1; + ;; + $ExceptionCopy) + echo "Failed to copy" + exit 1; + ;; + $ExceptionUmount) + echo "Failed to unmount $mountFolder." + exit 1; + ;; + $ExceptionHdiutilAttach) + echo "Failed to hdituli attach $mountFolder/$targetFile." + exit 1; + ;; + $ExceptionInstallSquish) + echo "Failed to install squish" + exit 1; + ;; + $ExceptionChangeOwnership) + echo "Failed to change ownership of $targetDirectory." + exit 1; + ;; + esac + } +} + +echo "Set commands for environment variables in .bashrc" + +if uname -a |grep -q "Ubuntu"; then + echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile + echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.profile +else + echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc + echo "export PATH=\$PATH:$quishFolder/squish-$version/bin" >> ~/.bashrc +fi + +echo "Installing squish license to home directory.." +MountAndInstall "$squishLicenseUrl" "$squishFolder" "$squishLicenseFile" + +echo "Installing squish $version.." +MountAndInstall "$squishUrl" "$squishFolder" "$squishFile" diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index f6a9fd90..4248d0ed 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -127,3 +127,19 @@ function is64bitWinHost return 0 } } + +Function Execute-Command +{ + Param ( + [string]$command + ) + Try { + echo "Executing command '$command'..." + $process = Start-Process -FilePath "cmd" -ArgumentList "/c $command" -PassThru -Wait -WindowStyle Hidden + if ($process.ExitCode) {throw "Error running command: '$command'"} + } + Catch { + $_.Exception.Message + exit 1 + } +} diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 new file mode 100644 index 00000000..7641c9fe --- /dev/null +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -0,0 +1,163 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +. "$PSScriptRoot\helpers.ps1" + + +# This script will install squish package for Windows. +# Squish is need by Release Test Automation (RTA) + +$version = "6.3.0" +# Qt branch without dot (*.*) +$qtBranch = "59x" +$targetDir = "C:\Utils\squish" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" +$squishBranchUrl = "$squishUrl\$qtBranch" + +# Squish license +$licensePackage = ".squish-3-license" + +$OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion" -Name ProductName).ProductName + +# This can be removed when using vanilla os +if((Test-Path -Path "$targetDir" )){ + try { + echo "Renaming old Squish" + echo "Rename-Item -ErrorAction 'Stop' $targetDir $targetDir_deleted" + Rename-Item -ErrorAction 'Stop' "$targetDir" squish_deleted + } catch {} +} + +Function DownloadAndInstallSquish { + + Param ( + [string]$version, + [string]$squishBranchUrl, + [string]$qtBranch, + [string]$bit, + [string]$targetDir, + [string]$squishPackage + ) + + $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" + $SquishInstaller = "$targetDir\$squishPackage.exe" + $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" + $Command = "$SquishInstaller $SquishParameters" + + echo "Fetching from URL ..." + Copy-Item "$SquishUrl" "$SquishInstaller" + echo "Installing Squish" + Execute-Command $Command + remove-item $SquishInstaller +} + +Function DownloadSquishLicence { + + Param ( + [string]$licensePackage, + [string]$squishUrl, + [string]$targetDir + ) + + # This can be removed when using vanilla os + if ($Env:SQUISH_LICENSEKEY_DIR) + { + echo "Removing SQUISH_LICENSEKEY_DIR env variable" + Remove-Item Env:\SQUISH_LICENSEKEY_DIR + } + + echo "Installing Squish license to home directory" + Copy-Item $squishUrl\$licensePackage ~\$licensePackage +} + +echo "Creating $targetDir" +New-Item -ErrorAction Ignore -ItemType directory -Path "$targetDir" + +DownloadSquishLicence $licensePackage $squishUrl $targetDir + +if(($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 8.1 Enterprise")) +{ + # Squish for Visual Studio 2015 + $squishPackage = "msvc14" + $squishPackage64bit = "msvc14_64" + + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) + { + echo "Installing $squishPackage_64" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage + mv $targetDir\$squishPackage $targetDir\$squishPackage64bit + } + + echo "Installing $squishPackage" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackage +} +if($OSVersion -eq "Windows 8.1 Enterprise") +{ + # Squish for Visual Studio 2013 + $squishPackage64bit = "msvc12_64" + + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) + { + echo "Installing $squishPackage_64" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage + mv $targetDir\$squishPackage $targetDir\$squishPackage64bit + } + else + { + echo "Change secret file to normal one" + attrib -h C:\Users\qt\.squish-3-license + } +} +else +{ + # Windows 7 + + # Squish for MinGW + $squishPackageMingw = "mingw_gcc53_posix_dwarf" + echo "Installing $squishPackageMingw" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win32 $targetDir $squishPackageMingw + mv $targetDir\$squishPackageMingw $targetDir\mingw + + # Squish for Visual Studio 2015 + $squishPackage = "msvc14" + $squishPackage64bit = "msvc14_64" + + if(($env:PROCESSOR_ARCHITECTURE -eq "AMD64") -or ($env:PROCESSOR_ARCHITEW6432 -eq "AMD64")) + { + echo "Installing $squishPackage64bit" + DownloadAndInstallSquish $version $squishBranchUrl $qtBranch win64 $targetDir $squishPackage + mv $targetDir\$squishPackage $targetDir\$squishPackage64bit + } + + +} diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh b/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh new file mode 100755 index 00000000..27ff15c3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +$BASEDIR/../common/unix/squishInstall.sh + diff --git a/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/90-squish.ps1 b/coin/provisioning/qtci-windows-10-x86_64/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-7-x86/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1 b/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 new file mode 100644 index 00000000..ff758845 --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" -- cgit v1.2.3 From 3504be0d83cdfb565ee5e3c043c33c54dacbfa54 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 26 Jan 2018 16:00:53 +0100 Subject: Adjust submodule branches Change-Id: If777dfa31ad635b8a2a6cb98d65c0be5f6e39a39 --- .gitmodules | 80 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 3d8128eb..9aa9576a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.10 + branch = 5.10.1 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.10 + branch = 5.10.1 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.10 + branch = 5.10.1 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.10 + branch = 5.10.1 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,108 +211,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.10 + branch = 5.10.1 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.10 + branch = 5.10.1 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.10 + branch = 5.10.1 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.10 + branch = 5.10.1 status = preview -- cgit v1.2.3 From 00e31823d35eecfa6ee265b1ccdb563dfe1b905f Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 29 Jan 2018 09:41:53 +0200 Subject: Provisioning: Attach subscription to system Subscriptions need to be reattached when subscriptions have been renewed by Red Hat. Directly pushed to get provisioning into working shape. Reviewed-by: Frederik Gladhorn Change-Id: I6e469d7fac3b848193f280702e1e807ce4ea096b --- .../01-refresh-subscription-manager.sh | 43 ++++++++++++++++++++++ .../01-refresh-subscription-manager.sh | 5 ++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh new file mode 100755 index 00000000..84238ebf --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-refresh-subscription-manager.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# refresh local certificates +sudo subscription-manager refresh + +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + 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 8b10ffd1..84238ebf 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 @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -38,3 +38,6 @@ set -ex # refresh local certificates sudo subscription-manager refresh +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + -- cgit v1.2.3