diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-06-11 10:08:07 +0300 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-09-04 08:29:01 +0000 |
commit | 7d0c343fc67d00c32ceb2fa84ec6546c0ddd3165 (patch) | |
tree | ddcb08cb0a8b836e3ae47acb8c0b9e8f54ddf105 /coin | |
parent | 413fcafc149328bdfa15913a1746162891dda5a2 (diff) |
Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.
Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/libclang.sh | 14 | ||||
-rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 2 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 39 |
4 files changed, 5 insertions, 52 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 7bcdbdce..d0fc607e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -74,7 +74,7 @@ rm "$ndkTargetFile" rm "$toolsTargetFile" echo "Changing ownership of Android files." -if uname -a |grep -q "el6\|el7"; then +if uname -a |grep -q "el7"; then sudo chown -R qt:wheel "$targetFolder" else sudo chown -R qt:users "$targetFolder" diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 645cf6ec..a9d1cc49 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -48,18 +48,12 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" source "${BASH_SOURCE%/*}/DownloadURL.sh" libclang_version=6.0 -libclang_version_Rhel6=4.0 if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-mac.7z" url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z" sha1="0af8ab8c1174faf4b721d079587190fc32ea8364" -elif uname -a |grep -q "el6"; then - version=$libclang_version_Rhel6 - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" - sha1="c7466109628418a6aa3db8b3f5825f847f1c4952" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" @@ -79,8 +73,6 @@ sudo mv /tmp/libclang "$destination" echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile echo "libClang = $version" >> ~/versions.txt -if [ "$version" == "6.0" ]; then - # This is a hacked static build of libclang which requires special - # handling on the qdoc side. - SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" -fi +# This is a hacked static build of libclang which requires special +# handling on the qdoc side. +SetEnvVar "QDOC_USE_STATIC_LIBCLANG" "1" diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b46a9d8d..cf1468c6 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -76,7 +76,7 @@ function MountAndInstall { usersGroup="staff" mountFolder="/Volumes" squishLicenseDir="/Users/qt" - elif uname -a |grep -q "el6\|el7"; then + elif uname -a |grep -q "el7"; then usersGroup="qt" mountFolder="/tmp" squishLicenseDir="/root" 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 deleted file mode 100755 index 76165a6c..00000000 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/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 - -BASEDIR=$(dirname "$0") -# shellcheck source=../common/unix/libclang.sh -"$BASEDIR/../common/unix/libclang.sh" "$URL" "$SHA1" "$VERSION" |