lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-25 07:41:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove command line tools from macOS 10.11 and 10.12

Browse Source 
Qt should not require command line tools to be installed.
When they are installed, we can accidentally rely on
on the tools instead of sysroot.

Task-number: QTBUG-58325
Change-Id: I9ad942c6f67e4c1b7348258a9178ab497ee58800
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Tony Sarajärvi
2017-03-01 08:07:39 +02:00
committed by Liang Qi
parent 88e87fe7d3
commit b14198730d
4 changed files with 16 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
View File

@@ -50,6 +50,7 @@ ExceptionSHA1=101
ExceptionUnXZ=102
ExceptionCPIO=103
ExceptionDelete=104
ExceptionAcceptLicense=105
url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Xcode_8.2.1.xz
@@ -73,6 +74,9 @@ try
echo "Deleting '${targetFile%.*}'"
rm "${targetFile%.*}" || throw $ExceptionDelete
echo "Accept license"
sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
echo "XCode = 8.2.1" >> ~/versions.txt
)
catch || {
@@ -97,6 +101,10 @@ catch || {
echo "Failed to delete temporary file."
exit 1;
;;
$ExceptionAcceptLicense)
echo "Failed to accept license."
exit 1;
;;
esac
}

111
coin/provisioning/qtci-macos-10.12-x86_64/021-commandlinetools.sh
View File

@@ -1,111 +0,0 @@
#!/bin/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$
##
#############################################################################
# This script installs Command Line Tools for Xcode
# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
ExceptionDownloadUrl=100
ExceptionSHA1=101
ExceptionAttachImage=102
ExceptionInstall=103
ExceptionDetachImage=104
ExceptionRemoveTmpFile=105
ExceptionAcceptLicense=106
url=http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg
targetFile=/tmp/Command_Line_Tools_macOS_10.12_for_Xcode_8.2.dmg
expectedSha1=0a55c5682c18879cfff7761619adb769ea396a79
try
(
echo "Downloading Command Line Tools from URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
echo "Checking SHA1 on '$targetFile'"
echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
echo Mounting DMG
hdiutil attach "$targetFile" || throw $ExceptionAttachImage
echo Installing Command Line Tools
(cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS Sierra version 10.12).pkg" -target /) || throw $ExceptionInstall
hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage
echo "Removing temporary file '$targetFile'"
rm "$targetFile" || throw $ExceptionRemoveTmpFile
echo "Accept license"
sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
echo "Command Line Tools = 8.2" >> ~/versions.txt
)
catch || {
case $ex_code in
$ExceptionDownloadUrl)
echo "Failed to download Command Line Tools from form URL '$url'."
exit 1;
;;
$ExceptionSHA1)
echo "Failed to check SHA1."
exit 1;
;;
$ExceptionAttachImage)
echo "Failed to attach image."
exit 1;
;;
$ExceptionInstall)
echo "Failed to install Command Line Tools."
exit 1;
;;
$ExceptionDetachImage)
echo "Failed to detach image."
exit 1;
;;
$ExceptionRemoveTmpFile)
echo "Failed to remove temporary file."
exit 1;
;;
$ExceptionAcceptLicense)
echo "Failed to accept license."
exit 1;
;;
esac
}

8
coin/provisioning/qtci-osx-10.11-x86_64/020-xcode.sh
View File

@@ -52,6 +52,7 @@ ExceptionSHA1=101
ExceptionUnXZ=102
ExceptionCPIO=103
ExceptionDelete=104
ExceptionAcceptLicense=105
url=http://ci-files01-hki.ci.local/input/mac/Xcode_8.2.xz
@@ -75,6 +76,9 @@ try
echo "Deleting '${targetFile%.*}'"
rm "${targetFile%.*}" || throw $ExceptionDelete
echo "Accept license"
sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
echo "Xcode = 8.2" >> ~/versions.txt
)
catch || {
@@ -99,6 +103,10 @@ catch || {
echo "Failed to delete temporary file."
exit 1;
;;
$ExceptionAcceptLicense)
echo "Failed to accept license."
exit 1;
;;
esac
}

111
coin/provisioning/qtci-osx-10.11-x86_64/021-commandlinetools.sh
View File

@@ -1,111 +0,0 @@
#!/bin/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$
##
#############################################################################
# This script installs Command Line Tools for Xcode
# Prerequisite: Get the .dmg file from Apple Store beforehand to local cache
# shellcheck source=../common/try_catch.sh
source "${BASH_SOURCE%/*}/../common/try_catch.sh"
ExceptionDownloadUrl=100
ExceptionSHA1=101
ExceptionAttachImage=102
ExceptionInstall=103
ExceptionDetachImage=104
ExceptionRemoveTmpFile=105
ExceptionAcceptLicense=106
url=http://ci-files01-hki.ci.local/input/mac/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg
targetFile=/tmp/Command_Line_Tools_macOS_10.11_for_Xcode_8.2.dmg
expectedSha1=4df615ca765ac1a1e681ddcbca79fc15990e3b25
try
(
echo "Downloading Command Line Tools from URL '$url'"
curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadUrl
echo "Checking SHA1 on '$targetFile'"
echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1
echo Mounting DMG
hdiutil attach "$targetFile" || throw $ExceptionAttachImage
echo Installing Command Line Tools
(cd /Volumes/Command\ Line\ Developer\ Tools/ && sudo installer -pkg "Command Line Tools (macOS El Capitan version 10.11).pkg" -target /) || throw $ExceptionInstall
hdiutil detach /dev/disk1s1 || throw $ExceptionDetachImage
echo "Removing temporary file '$targetFile'"
rm "$targetFile" || throw $ExceptionRemoveTmpFile
echo "Accept license"
sudo xcodebuild -license accept || throw $ExceptionAcceptLicense
echo "Command Line Tools = 8.2" >> ~/versions.txt
)
catch || {
case $ex_code in
$ExceptionDownloadUrl)
echo "Failed to download Command Line Tools from form URL '$url'."
exit 1;
;;
$ExceptionSHA1)
echo "Failed to check SHA1."
exit 1;
;;
$ExceptionAttachImage)
echo "Failed to attach image."
exit 1;
;;
$ExceptionInstall)
echo "Failed to install Command Line Tools."
exit 1;
;;
$ExceptionDetachImage)
echo "Failed to detach image."
exit 1;
;;
$ExceptionRemoveTmpFile)
echo "Failed to remove temporary file."
exit 1;
;;
$ExceptionAcceptLicense)
echo "Failed to accept license."
exit 1;
;;
esac
}