From 9715f5ce56175f936f04278317ea0619f1e57516 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 15 Nov 2021 17:30:58 +0200 Subject: [PATCH] Provisioning: Start using latest macOS 11 version 11.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New tier 1 image's name format is qtci-macos-11-x86_64 Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 1865d70ef892d3a06e7aef4f0861e28f0812dc2d) Reviewed-by: Tony Sarajärvi --- .../cmake_platforms_static_tests.yaml | 2 +- .../macos-developer-build-tests.yaml | 2 +- coin/platform_configs/macos.yaml | 2 +- .../01-disable-net-lso.sh | 0 .../01-disable-notifications_and_warnings.sh | 0 .../01-increase_limits.sh | 0 .../01-install_telegraf.sh | 0 .../01-sha1sum-compatibility.sh | 47 +++++++++++++++++ .../03-bashprofile.sh | 0 .../05-systemsetup.sh | 32 +++++++----- .../06-crashreporter.sh | 0 .../06-disable_spotlight.sh | 0 .../06-disable_update_downloads.sh | 0 .../07-SSL_keychain.sh | 0 .../15-xz.sh | 32 +++++++----- .../20-java.sh | 0 .../20-xcode.sh | 32 +++++++----- .../21-install-commandlinetools.sh | 52 +++++++++++++++++++ .../24-sccache.sh | 0 .../25-cmake.sh | 0 .../25-homebrew.sh | 32 +++++++----- .../25-mysql.sh | 32 +++++++----- .../25-pip.sh | 0 .../25-postgresql.sh | 0 .../25-python2.sh | 0 .../25-python3.sh | 0 .../26-freetype.sh | 0 .../26-ninja.sh | 0 .../26-odbc.sh | 0 .../26-p7zip.sh | 0 .../26-pcre2.sh | 0 .../27-libclang.sh | 0 .../28-libclang-v100-dyn.sh | 0 .../29-libusb.sh | 0 .../30-android.sh | 32 +++++++----- .../30-fbx.sh | 0 .../30-install-conan.sh | 0 .../30-nodejs.sh | 0 .../35-install-breakpad.sh | 0 .../35-install_protobuff.sh | 46 ++++++++++++++++ .../35-openssl.sh | 0 .../36-emsdk.sh | 0 .../80-screenresolution.sh | 0 .../90-squish.sh | 0 .../97-set-locale.sh | 0 .../99-mac-version.sh | 0 .../01-sha1sum-compatibility.sh | 41 --------------- .../21-install-commandlinetools.sh | 46 ---------------- .../35-install_protobuff.sh | 40 -------------- 49 files changed, 262 insertions(+), 208 deletions(-) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-disable-net-lso.sh (100%) mode change 100644 => 100755 rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-disable-notifications_and_warnings.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-increase_limits.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/01-install_telegraf.sh (100%) create mode 100755 coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/03-bashprofile.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/05-systemsetup.sh (73%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-crashreporter.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-disable_spotlight.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/06-disable_update_downloads.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/07-SSL_keychain.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/15-xz.sh (52%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/20-java.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/20-xcode.sh (59%) create mode 100755 coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/24-sccache.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-cmake.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-homebrew.sh (58%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-mysql.sh (57%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-pip.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-postgresql.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-python2.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/25-python3.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-freetype.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-ninja.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-odbc.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-p7zip.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/26-pcre2.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/27-libclang.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/28-libclang-v100-dyn.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/29-libusb.sh (100%) mode change 100644 => 100755 rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-android.sh (71%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-fbx.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-install-conan.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/30-nodejs.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/35-install-breakpad.sh (100%) create mode 100755 coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/35-openssl.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/36-emsdk.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/80-screenresolution.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/90-squish.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/97-set-locale.sh (100%) rename coin/provisioning/{qtci-macos-11.0-x86_64 => qtci-macos-11-x86_64}/99-mac-version.sh (100%) delete mode 100755 coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh delete mode 100755 coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh delete mode 100755 coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index f071002c..1b447ac4 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -22,7 +22,7 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}' ] - - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF' diff --git a/coin/platform_configs/macos-developer-build-tests.yaml b/coin/platform_configs/macos-developer-build-tests.yaml index ee16d6fd..94e85246 100644 --- a/coin/platform_configs/macos-developer-build-tests.yaml +++ b/coin/platform_configs/macos-developer-build-tests.yaml @@ -18,7 +18,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-x86_64-developer-build' - Id: 'macos-11-x86_64-developer-build-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-latest-xcode-x86_64-developer-build' diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index ffc6f397..9c41ef09 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -35,7 +35,7 @@ Configurations: Platform dependency: 'macos-latest-xcode-universal-packaging-build' - Id: 'macos-11-x86_64-tests' - Template: 'qtci-macos-11.0-x86_64-102' + Template: 'qtci-macos-11-x86_64-104' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-latest-xcode-universal-packaging-build' diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh b/coin/provisioning/qtci-macos-11-x86_64/01-disable-net-lso.sh old mode 100644 new mode 100755 similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-disable-net-lso.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-disable-net-lso.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-11-x86_64/01-disable-notifications_and_warnings.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-disable-notifications_and_warnings.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-11-x86_64/01-increase_limits.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-increase_limits.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-increase_limits.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-11-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/01-install_telegraf.sh rename to coin/provisioning/qtci-macos-11-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000..cf0611cd --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-11-x86_64/03-bashprofile.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/03-bashprofile.sh rename to coin/provisioning/qtci-macos-11-x86_64/03-bashprofile.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-11-x86_64/05-systemsetup.sh similarity index 73% rename from coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh rename to coin/provisioning/qtci-macos-11-x86_64/05-systemsetup.sh index 35385502..99e22d40 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/05-systemsetup.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/05-systemsetup.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2021 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-11-x86_64/06-crashreporter.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-crashreporter.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-crashreporter.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-11-x86_64/06-disable_spotlight.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-disable_spotlight.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-disable_spotlight.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-11-x86_64/06-disable_update_downloads.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/06-disable_update_downloads.sh rename to coin/provisioning/qtci-macos-11-x86_64/06-disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-11-x86_64/07-SSL_keychain.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/07-SSL_keychain.sh rename to coin/provisioning/qtci-macos-11-x86_64/07-SSL_keychain.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-11-x86_64/15-xz.sh similarity index 52% rename from coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh rename to coin/provisioning/qtci-macos-11-x86_64/15-xz.sh index 0d609fb5..c2f6e73f 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/15-xz.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/15-xz.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh b/coin/provisioning/qtci-macos-11-x86_64/20-java.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/20-java.sh rename to coin/provisioning/qtci-macos-11-x86_64/20-java.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh similarity index 59% rename from coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh rename to coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh index a58e6607..88ba7f36 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/20-xcode.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2021 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh new file mode 100755 index 00000000..7e1152d1 --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/21-install-commandlinetools.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/macos/install-commandlinetools.sh +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" +version="12.5.1" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517" + +InstallCommandLineTools $url $url $sha1 $packageName $version + diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh b/coin/provisioning/qtci-macos-11-x86_64/24-sccache.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/24-sccache.sh rename to coin/provisioning/qtci-macos-11-x86_64/24-sccache.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-11-x86_64/25-cmake.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-cmake.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-cmake.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh similarity index 58% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh index 46d21aaa..b177ab82 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2021 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-11-x86_64/25-mysql.sh similarity index 57% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-mysql.sh index 2ec3705f..d113c4cb 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/25-mysql.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/25-mysql.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-11-x86_64/25-pip.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-pip.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-pip.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-11-x86_64/25-postgresql.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-postgresql.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-postgresql.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-11-x86_64/25-python2.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-python2.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-python2.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-11-x86_64/25-python3.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/25-python3.sh rename to coin/provisioning/qtci-macos-11-x86_64/25-python3.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-11-x86_64/26-freetype.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-freetype.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-freetype.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-11-x86_64/26-ninja.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-ninja.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-ninja.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-11-x86_64/26-odbc.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-odbc.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-odbc.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-p7zip.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-p7zip.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-11-x86_64/26-pcre2.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/26-pcre2.sh rename to coin/provisioning/qtci-macos-11-x86_64/26-pcre2.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-11-x86_64/27-libclang.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/27-libclang.sh rename to coin/provisioning/qtci-macos-11-x86_64/27-libclang.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-11-x86_64/28-libclang-v100-dyn.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/28-libclang-v100-dyn.sh rename to coin/provisioning/qtci-macos-11-x86_64/28-libclang-v100-dyn.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh old mode 100644 new mode 100755 similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/29-libusb.sh rename to coin/provisioning/qtci-macos-11-x86_64/29-libusb.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh similarity index 71% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-android.sh index e75052d0..5bd87fa7 100755 --- a/coin/provisioning/qtci-macos-11.0-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -3,31 +3,37 @@ ############################################################################# ## ## Copyright (C) 2020 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ +## Contact: https://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. ## -## $QT_BEGIN_LICENSE:LGPL21$ +## $QT_BEGIN_LICENSE:LGPL$ ## 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. +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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. +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.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. +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. ## ## $QT_END_LICENSE$ ## diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-11-x86_64/30-fbx.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-fbx.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-fbx.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-11-x86_64/30-install-conan.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-install-conan.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-install-conan.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-11-x86_64/30-nodejs.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/30-nodejs.sh rename to coin/provisioning/qtci-macos-11-x86_64/30-nodejs.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-11-x86_64/35-install-breakpad.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/35-install-breakpad.sh rename to coin/provisioning/qtci-macos-11-x86_64/35-install-breakpad.sh diff --git a/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh new file mode 100755 index 00000000..08c955e9 --- /dev/null +++ b/coin/provisioning/qtci-macos-11-x86_64/35-install_protobuff.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2020 The Qt Company Ltd. +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## 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 https://www.qt.io/terms-conditions. For further +## information use the contact form at https://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 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# shellcheck source=../common/unix/install_protobuff.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" + diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-11-x86_64/35-openssl.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/35-openssl.sh rename to coin/provisioning/qtci-macos-11-x86_64/35-openssl.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-11-x86_64/36-emsdk.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/36-emsdk.sh rename to coin/provisioning/qtci-macos-11-x86_64/36-emsdk.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh b/coin/provisioning/qtci-macos-11-x86_64/80-screenresolution.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/80-screenresolution.sh rename to coin/provisioning/qtci-macos-11-x86_64/80-screenresolution.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-11-x86_64/90-squish.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/90-squish.sh rename to coin/provisioning/qtci-macos-11-x86_64/90-squish.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-11-x86_64/97-set-locale.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/97-set-locale.sh rename to coin/provisioning/qtci-macos-11-x86_64/97-set-locale.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-11-x86_64/99-mac-version.sh similarity index 100% rename from coin/provisioning/qtci-macos-11.0-x86_64/99-mac-version.sh rename to coin/provisioning/qtci-macos-11-x86_64/99-mac-version.sh diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh deleted file mode 100755 index 739a809d..00000000 --- a/coin/provisioning/qtci-macos-11.0-x86_64/01-sha1sum-compatibility.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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$ -## -############################################################################# - -#!/usr/bin/env bash - -set -ex - -# shellcheck source=../common/macos/sha1sum-compatibility.sh -source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh deleted file mode 100755 index aa65b15f..00000000 --- a/coin/provisioning/qtci-macos-11.0-x86_64/21-install-commandlinetools.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2021 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 - -# shellcheck source=../common/macos/install-commandlinetools.sh -source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="12.5.1" -packageName="Command_Line_Tools_for_Xcode_$version.dmg" -url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" -sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517" - -InstallCommandLineTools $url $url $sha1 $packageName $version - diff --git a/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh b/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh deleted file mode 100755 index ac9d86ca..00000000 --- a/coin/provisioning/qtci-macos-11.0-x86_64/35-install_protobuff.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash - -############################################################################# -## -## Copyright (C) 2020 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 - -# shellcheck source=../common/unix/install_protobuff.sh -source "${BASH_SOURCE%/*}/../common/unix/install_protobuff.sh" -