From 3690fe06a43468edf345ad039683baa76831027b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 27 Jul 2017 12:40:46 +0300 Subject: Provisioning: Update CMake on osx 10.10 Pyside requires cmake 3.1.0 or more recent. Change-Id: Ic376d5e5af9f9b0692a2de7c4ec35e6c8bfa9465 Reviewed-by: Simon Hausmann --- coin/provisioning/common/cmake.sh | 51 +++++++++++++++++++++ .../qtci-osx-10.10-x86_64/004-cmake.sh | 4 ++ .../qtci-osx-10.11-x86_64/025-cmake.sh | 53 ++-------------------- 3 files changed, 58 insertions(+), 50 deletions(-) create mode 100755 coin/provisioning/common/cmake.sh create mode 100755 coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh diff --git a/coin/provisioning/common/cmake.sh b/coin/provisioning/common/cmake.sh new file mode 100755 index 00000000..fe84cd0e --- /dev/null +++ b/coin/provisioning/common/cmake.sh @@ -0,0 +1,51 @@ +#!/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 CMake + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=./InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" +SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" +appPrefix="cmake-3.6.2-Darwin-x86_64" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" + +echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc +echo "CMake = 3.6.2" >> ~/versions.txt diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh new file mode 100755 index 00000000..ddb01d64 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/004-cmake.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake.sh diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh index 085225d7..ddb01d64 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -1,51 +1,4 @@ -#!/bin/bash +#!/usr/bin/env 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 CMake - -# CMake is needed for autotests that verify that Qt can be built with CMake - -# shellcheck source=../common/InstallAppFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" - -PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" -SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" -appPrefix="cmake-3.6.2-Darwin-x86_64" - -InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" - -echo "export PATH=/Applications/CMake.app/Contents/bin:$PATH" >> ~/.bashrc -echo "CMake = 3.6.2" >> ~/versions.txt +BASEDIR=$(dirname "$0") +$BASEDIR/../common/cmake.sh -- cgit v1.2.3