diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-11-02 16:09:11 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-10 07:58:26 +0000 |
commit | 2a28ce864bed677e4ac2477eedf6bee498075d94 (patch) | |
tree | 8fe52c45bc62fd7185fccaa7f4b66baa544fa779 /coin/provisioning/qtci-linux-RHEL-6.6-x86_64 | |
parent | 52da24b78eaac04b490b1d4a1750515284521423 (diff) |
Split Common folder based on operating system families
This change will split common folder to four different folders:
Linux, Unix, Windows and MacOS. Each of these folders includes scripts
which are common for their operating system familes
Task-number: QTQAINFRA-1451
Change-Id: Ic93b2183052335dee875d1452b21e38d268b6474
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'coin/provisioning/qtci-linux-RHEL-6.6-x86_64')
4 files changed, 4 insertions, 4 deletions
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 index 945d2e99..90b32d0d 100755 --- 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 @@ -35,7 +35,7 @@ set -ex -source "${BASH_SOURCE%/*}/../common/check_and_set_proxy.sh" +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" if [ "$proxy" != "" ]; then echo "proxy=$proxy" | sudo tee -a /etc/yum.conf 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 5248f86f..b418ed8b 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 @@ -8,4 +8,4 @@ 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" -$BASEDIR/../common/libclang.sh "$URL" "$SHA1" "$VERSION" +$BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" 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 00b57918..572ad7ad 100755 --- 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,4 +1,4 @@ #!/usr/bin/env bash set -ex -$(dirname $0)/../common/cmake_linux.sh +$(dirname $0)/../common/linux/cmake_linux.sh 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 index fb3e9642..739d06b6 100755 --- 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 @@ -44,4 +44,4 @@ echo "***** All installed RPM packages *****" >> ~/versions.txt rpm -q -a | sort >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -$(dirname $0)/../common/version.sh +$(dirname $0)/../common/linux/version.sh |