diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-02 12:14:55 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-03 00:02:43 +0200 |
commit | a94696ccd5be936099809eda58db02999cb7c77a (patch) | |
tree | d8405a9848a24535aa86951305bdef035e4a7cc8 /coin/provisioning/common/macos | |
parent | 4c5d3f2e43008da3e7e96e7cbed31bc3bbf6cfab (diff) | |
parent | 125c5e6528abee7796f6e5b68526bc050bd9250e (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
.gitmodules
ignore QtWebEngine on QEMU temporarily.
coin/platform_configs/default.yaml
no-gui build was removed temporarily.
coin/platform_configs/qt5.yaml
coin/platform_configs/qtbase.yaml
coin/platform_configs/qtconnectivity.yaml
coin/platform_configs/qtsaferenderer.yaml
Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
Diffstat (limited to 'coin/provisioning/common/macos')
-rwxr-xr-x | coin/provisioning/common/macos/macos-version.sh | 53 | ||||
-rwxr-xr-x | coin/provisioning/common/macos/version.sh | 43 |
2 files changed, 96 insertions, 0 deletions
diff --git a/coin/provisioning/common/macos/macos-version.sh b/coin/provisioning/common/macos/macos-version.sh new file mode 100755 index 00000000..9f357b8c --- /dev/null +++ b/coin/provisioning/common/macos/macos-version.sh @@ -0,0 +1,53 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 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 needs to be called last during provisioning so that the software information will show up last in provision log. + +set -ex + +# Print all build machines versions to provision log +echo "*********************************************" >> ~/versions.txt +echo "***** macOS version *****" >> ~/versions.txt +sw_vers >> ~/versions.txt +echo "***** All installed packages *****" >> ~/versions.txt +echo "***** HomeBrew *****" >> ~/versions.txt +brew list --versions >> ~/versions.txt +echo "***** HomeBrew Casks*****" >> ~/versions.txt +brew cask list --versions >> ~/versions.txt +echo "***** Apple's installer *****" >> ~/versions.txt +pkgutil --pkgs >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/version.sh" diff --git a/coin/provisioning/common/macos/version.sh b/coin/provisioning/common/macos/version.sh new file mode 100755 index 00000000..3e2a7f19 --- /dev/null +++ b/coin/provisioning/common/macos/version.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 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 will print all installed software to provision log. +# Script needs to be named so that it will be ran at last during provisioning + +# Print all build machines versions to provision log +echo "*********************************************" +echo "***** SW VERSIONS *****" +cat ~/versions.txt +echo "*********************************************" |