From 04d1ee1df4302c78be54da76826221661ff25056 Mon Sep 17 00:00:00 2001 From: Rainer Keller Date: Thu, 8 Mar 2018 08:24:33 +0100 Subject: Provisioning: Create symbolic for shasum tool on macOS for compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. In order to make all unix provisioning scripts run on macOS without special case handling a symbolic link is created. Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7 Reviewed-by: Joni Jäntti Reviewed-by: Frederik Gladhorn Reviewed-by: Simo Fält --- .../common/macos/sha1sum-compatibility.sh | 49 ++++++++++++++++++++++ coin/provisioning/common/unix/DownloadURL.sh | 2 +- coin/provisioning/common/unix/libclang.sh | 7 +--- .../01-sha1sum-compatibility.sh | 1 + .../01-sha1sum-compatibility.sh | 1 + .../01-sha1sum-compatibility.sh | 1 + 6 files changed, 54 insertions(+), 7 deletions(-) create mode 100755 coin/provisioning/common/macos/sha1sum-compatibility.sh create mode 120000 coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh create mode 120000 coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh create mode 120000 coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh diff --git a/coin/provisioning/common/macos/sha1sum-compatibility.sh b/coin/provisioning/common/macos/sha1sum-compatibility.sh new file mode 100755 index 00000000..5080f8fc --- /dev/null +++ b/coin/provisioning/common/macos/sha1sum-compatibility.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 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$ +## +############################################################################# + +# On macOS the sha1 tool is named 'shasum' while on all other unix systems it is called 'sha1sum'. +# In order to make all unix provioning scripts run on macOS without special case handling +# a symbolic link is created. +# The shasum tool is a perl script which does some globbing to determine the perl version. The +# symbolic link has to point directly to the binary including the perl version. +# Additionally the CI seems to have multiple parallel perl versions installed which causes +# multiple shasum tools to be present (shasum5.16, shasum5.18). +# +# Currently this is +# /usr/local/bin/sha1sum -> /usr/bin/shasum5.18 + +[ -d /usr/local/bin ] || sudo mkdir -p /usr/local/bin +SHASUM_TOOLNAME=$(ls -r /usr/bin/shasum?.* | head -n1) +sudo ln -s "${SHASUM_TOOLNAME}" /usr/local/bin/sha1sum diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index cb890e8a..d3a8a7d0 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -71,7 +71,7 @@ function DownloadURL { } echo "Checking SHA1 on PKG '$targetFile'" echo "$expectedSha1 *$targetFile" > $targetFile.sha1 - shasum --check $targetFile.sha1 || throw $ExceptionSHA1 + sha1sum --check $targetFile.sha1 || throw $ExceptionSHA1 ) catch || { diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index d59c9fa2..7f29259e 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -60,12 +60,7 @@ zip="libclang.7z" destination="/usr/local/libclang-$version" curl --fail -L --retry 5 --retry-delay 5 -o "$zip" "$url" -_shasum=sha1sum -if [[ "$OSTYPE" == "darwin"* ]]; then - echo "DARWIN" - _shasum=/usr/bin/shasum -fi -echo "$sha1 $zip" | $_shasum --check +echo "$sha1 $zip" | sha1sum --check 7z x $zip -o/tmp/ rm -rf $zip diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh new file mode 120000 index 00000000..58a40af4 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1 @@ +../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh new file mode 120000 index 00000000..58a40af4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1 @@ +../common/macos/sha1sum-compatibility.sh \ No newline at end of file diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh new file mode 120000 index 00000000..58a40af4 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1 @@ +../common/macos/sha1sum-compatibility.sh \ No newline at end of file -- cgit v1.2.3