diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-20 21:22:31 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-20 22:33:59 +0100 |
commit | 91739f5fe3554f0c847346d6011e20de2a24f586 (patch) | |
tree | 6a6874edbd74692712480ad31bbd102fc2a9ce57 /coin/provisioning/common | |
parent | c64b2415d326f21119399b76549ef9de3195b538 (diff) | |
parent | e086fbc6cb80b089ed3e336a47e849fc1b5023ca (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
coin/provisioning/common/linux/open62541.sh
coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh
Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/cmake_linux.sh | 1 | ||||
-rwxr-xr-x | coin/provisioning/common/linux/open62541.sh | 14 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/python2.sh | 52 |
4 files changed, 66 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 76db19d4..a7b83fd7 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -88,7 +88,7 @@ try fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." - if [ "$proxy" != "" ]; then + if [ "$http_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 diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 98af57c8..7154d822 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -37,7 +37,6 @@ # CMake is needed for autotests that verify that Qt can be built with CMake -# shellcheck source=InstallFromCompressedFileFromURL.sh source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" diff --git a/coin/provisioning/common/linux/open62541.sh b/coin/provisioning/common/linux/open62541.sh index bde5b0de..fc215e8a 100755 --- a/coin/provisioning/common/linux/open62541.sh +++ b/coin/provisioning/common/linux/open62541.sh @@ -33,11 +33,23 @@ ## ############################################################################# +set +e + +# We need to source to be able to use cmake in the shell +if uname -a |grep -q "Ubuntu"; then + source ~/.profile +else + source ~/.bashrc +fi + +set -ex + TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" trap "sudo rm -fr $TEMPDIR" EXIT cd $TEMPDIR -pip install six +sudo pip install --upgrade pip +sudo pip install six git clone https://github.com/open62541/open62541.git open62541 cd open62541 diff --git a/coin/provisioning/common/macos/python2.sh b/coin/provisioning/common/macos/python2.sh new file mode 100755 index 00000000..fbebee42 --- /dev/null +++ b/coin/provisioning/common/macos/python2.sh @@ -0,0 +1,52 @@ +#!/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$ +## +############################################################################# + +# This script installs python2 + +source "${BASH_SOURCE%/*}/InstallPKGFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/python-2.7.14-macosx10.6.pkg" +AltUrl="https://www.python.org/ftp/python/2.7.14/python-2.7.14-macosx10.6.pkg" +SHA1="fa2bb77243ad0cb611aa3295204fab403bb0fa09" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +/Library/Frameworks/Python.framework/Versions/2.7/bin/pip install virtualenv + +SetEnvVar "PATH" "/Library/Frameworks/Python.framework/Versions/2.7/bin/:\$PATH" + +echo "python2 = 2.7.14" >> ~/versions.txt |