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/linux | |
| 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/linux')
| -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 |
3 files changed, 14 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 |