diff options
5 files changed, 87 insertions, 10 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index c3af6b5d..ead44c6e 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -13,10 +13,10 @@ qtci-linux-openSUSE-42.3-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker -qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release +qtci-macos-10.12-x86_64-9 Clang Packaging DebugAndRelease Release qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests -qtci-macos-10.12-x86_64-8 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-macos-10.12-x86_64-9 IOS_ANY x86_64 Clang Release DisableTests Static qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index a312410b..6c199c31 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -12,10 +12,10 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packagin qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 +qtci-macos-10.12-x86_64-9 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 +qtci-macos-10.12-x86_64-9 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-9 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/common/macos/install_xcode_9_orHigher.sh b/coin/provisioning/common/macos/install_xcode_9_orHigher.sh new file mode 100755 index 00000000..cbf38580 --- /dev/null +++ b/coin/provisioning/common/macos/install_xcode_9_orHigher.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_8.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_8.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you a file called "Content.part00.cpio.xz" that +# can be renamed to Xcode_8.xz for this script. + + + +function InstallXCode() { + sourceFile=$1 + version=$2 + + echo "Uncompressing and installing '$sourceFile'" + if [[ $sourceFile =~ tar ]]; then + cd /Applications/ && sudo tar -zxf "$sourceFile" + else + xzcat < "$sourceFile" | (cd /Applications/ && sudo cpio -dmi) + fi + + echo "Versioning application bundle" + majorVersion=$(echo $version | cut -d '.' -f 1) + versionedAppBundle="/Applications/Xcode${majorVersion}.app" + sudo mv /Applications/Xcode.app ${versionedAppBundle} + + echo "Selecting Xcode" + sudo xcode-select --switch ${versionedAppBundle} + + echo "Accept license" + sudo xcodebuild -license accept + + echo "Install packages" + # -runFirstLaunch is valid in 9.x + sudo xcodebuild -runFirstLaunch || true + + echo "Enabling developer mode, so that using lldb does not require interactive password entry" + sudo /usr/sbin/DevToolsSecurity -enable + + echo "Xcode = $version" >> ~/versions.txt +} diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh index 84a6d06f..107d349f 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/20-xcode.sh @@ -45,6 +45,6 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh -source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" +source "${BASH_SOURCE%/*}/../common/macos/install_xcode_9_orHigher.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_8.3.3.xz 8.3.3 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.2_updated.tar.gz 9.2 diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh index d534e74d..281f7dba 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="8.3.2" -packageName="CommandLineToolsforXcode$version.dmg" +version="9.2" +packageName="Command_Line_Tools_macOS_10.12_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" +sha1="f121c3b70fb77a98c1f2fc5e1932bd93bde03acf" InstallCommandLineTools $url $url $sha1 $packageName $version |