diff --git a/contrib/devtools/build_depends.sh b/contrib/devtools/build_depends.sh --- a/contrib/devtools/build_depends.sh +++ b/contrib/devtools/build_depends.sh @@ -19,17 +19,7 @@ mkdir -p "${SDK_PATH}" pushd "${SDK_PATH}" - find . -maxdepth 1 -type d -name "MacOSX*" -exec rm -rf {} \; - - SDK_ARCHIVE_NAME="MacOSX10.14.sdk.tar.gz" - OSX_SDK_SHA256="2322086a96349db832abbcadea493b79db843553a2e604163238d99fa058a286" - - OSX_SDK="${SDK_ARCHIVE_DIR}/${SDK_ARCHIVE_NAME}" - if ! echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum -c; then - rm -f "${OSX_SDK}" - wget https://storage.googleapis.com/27cd7b2a42a430926cc621acdc3bda72a8ed2b0efc080e3/"${SDK_ARCHIVE_NAME}" -O "${OSX_SDK}" - echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum -c - fi + OSX_SDK=$("${TOPLEVEL}/contrib/teamcity/download-apple-sdk.sh" "${SDK_PATH}") tar -xzf "${OSX_SDK}" diff --git a/contrib/teamcity/download-apple-sdk.sh b/contrib/teamcity/download-apple-sdk.sh new file mode 100755 --- /dev/null +++ b/contrib/teamcity/download-apple-sdk.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +export LC_ALL=C + +set -euxo pipefail + +usage() { + echo "Usage: download-apple-sdk.sh dest_dir" + echo "Output: prints the SDK file name" +} + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + +DEST_DIR="$1" + +: "${TOPLEVEL:=$(git rev-parse --show-toplevel)}" + +OSX_SDK="Xcode-11.3.1-11C505-extracted-SDK-with-libcxx-headers.tar.gz" +OSX_SDK_SHA256="a1b8af4c4d82d519dd5aff2135fe56184fa758c30e310b5fb4bfc8d9d3b45d8a" + +pushd "${DEST_DIR}" > /dev/null +if ! echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum --quiet -c > /dev/null 2>&1; then + rm -f "${OSX_SDK}" + wget -q https://storage.googleapis.com/27cd7b2a42a430926cc621acdc3bda72a8ed2b0efc080e3/"${OSX_SDK}" + echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum --quiet -c +fi +popd > /dev/null + +echo "${OSX_SDK}" diff --git a/contrib/teamcity/gitian.sh b/contrib/teamcity/gitian.sh --- a/contrib/teamcity/gitian.sh +++ b/contrib/teamcity/gitian.sh @@ -17,17 +17,10 @@ ./bin/make-base-vm --docker --arch amd64 --distro debian --suite buster if [[ "${OS_NAME}" == "osx" ]]; then - OSX_SDK="Xcode-11.3.1-11C505-extracted-SDK-with-libcxx-headers.tar.gz" - OSX_SDK_SHA256="a1b8af4c4d82d519dd5aff2135fe56184fa758c30e310b5fb4bfc8d9d3b45d8a" OSX_SDK_DIR=~/.abc-build-cache/osx-sdk mkdir -p "${OSX_SDK_DIR}" - pushd "${OSX_SDK_DIR}" - if ! echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum -c; then - rm -f "${OSX_SDK}" - wget https://storage.googleapis.com/27cd7b2a42a430926cc621acdc3bda72a8ed2b0efc080e3/"${OSX_SDK}" - echo "${OSX_SDK_SHA256} ${OSX_SDK}" | sha256sum -c - fi - popd + + OSX_SDK=$("${TOPLEVEL}/contrib/teamcity/download-apple-sdk.sh" "${OSX_SDK_DIR}") mkdir -p inputs cp "${OSX_SDK_DIR}/${OSX_SDK}" inputs/"${OSX_SDK}"