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 @@ -9,28 +9,33 @@ : "${SDK_PATH:=${DEPENDS_DIR}/SDKs}" : "${SDK_ARCHIVE_DIR:=${SDK_PATH}}" +DEPENDS_BUILD_TARGET="${1:-all}" + pushd "${DEPENDS_DIR}" -# Get the OSX SDK -mkdir -p "${SDK_PATH}" -pushd "${SDK_PATH}" +if [ "${DEPENDS_BUILD_TARGET}" = "osx" ] +then + # Get the OSX SDK + mkdir -p "${SDK_PATH}" + pushd "${SDK_PATH}" -find . -maxdepth 1 -type d -name "MacOSX*" -exec rm -rf {} \; + find . -maxdepth 1 -type d -name "MacOSX*" -exec rm -rf {} \; -SDK_ARCHIVE_NAME="MacOSX10.14.sdk.tar.gz" -OSX_SDK_SHA256="2322086a96349db832abbcadea493b79db843553a2e604163238d99fa058a286" + 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="${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 -tar -xzf "${OSX_SDK}" + tar -xzf "${OSX_SDK}" -popd + popd +fi -make build-all +make "build-${DEPENDS_BUILD_TARGET}" popd diff --git a/contrib/teamcity/builds/build-linux-aarch64.sh b/contrib/teamcity/builds/build-linux-aarch64.sh --- a/contrib/teamcity/builds/build-linux-aarch64.sh +++ b/contrib/teamcity/builds/build-linux-aarch64.sh @@ -7,7 +7,7 @@ # shellcheck source=../ci-fixture.sh source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" -build_static_dependencies +build_static_dependencies linux-aarch64 CMAKE_FLAGS=( "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/LinuxAArch64.cmake" diff --git a/contrib/teamcity/builds/build-linux-arm.sh b/contrib/teamcity/builds/build-linux-arm.sh --- a/contrib/teamcity/builds/build-linux-arm.sh +++ b/contrib/teamcity/builds/build-linux-arm.sh @@ -7,7 +7,7 @@ # shellcheck source=../ci-fixture.sh source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" -build_static_dependencies +build_static_dependencies linux-arm CMAKE_FLAGS=( "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/LinuxARM.cmake" diff --git a/contrib/teamcity/builds/build-linux32.sh b/contrib/teamcity/builds/build-linux32.sh --- a/contrib/teamcity/builds/build-linux32.sh +++ b/contrib/teamcity/builds/build-linux32.sh @@ -7,7 +7,7 @@ # shellcheck source=../ci-fixture.sh source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" -build_static_dependencies +build_static_dependencies linux32 # Build, run unit tests and functional tests. CMAKE_FLAGS=( diff --git a/contrib/teamcity/builds/build-linux64.sh b/contrib/teamcity/builds/build-linux64.sh --- a/contrib/teamcity/builds/build-linux64.sh +++ b/contrib/teamcity/builds/build-linux64.sh @@ -7,7 +7,7 @@ # shellcheck source=../ci-fixture.sh source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" -build_static_dependencies +build_static_dependencies linux64 # Build, run unit tests and functional tests. CMAKE_FLAGS=( diff --git a/contrib/teamcity/builds/build-osx.sh b/contrib/teamcity/builds/build-osx.sh --- a/contrib/teamcity/builds/build-osx.sh +++ b/contrib/teamcity/builds/build-osx.sh @@ -9,7 +9,7 @@ export PYTHONPATH="${TOPLEVEL}/depends/x86_64-apple-darwin16/native/lib/python3/dist-packages:${PYTHONPATH:-}" -build_static_dependencies +build_static_dependencies osx CMAKE_FLAGS=( "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/OSX.cmake" diff --git a/contrib/teamcity/builds/build-win64.sh b/contrib/teamcity/builds/build-win64.sh --- a/contrib/teamcity/builds/build-win64.sh +++ b/contrib/teamcity/builds/build-win64.sh @@ -7,7 +7,7 @@ # shellcheck source=../ci-fixture.sh source "${TOPLEVEL}/contrib/teamcity/ci-fixture.sh" -build_static_dependencies +build_static_dependencies win64 CMAKE_FLAGS=( "-DCMAKE_TOOLCHAIN_FILE=${CMAKE_PLATFORMS_DIR}/Win64.cmake" diff --git a/contrib/teamcity/ci-fixture.sh b/contrib/teamcity/ci-fixture.sh --- a/contrib/teamcity/ci-fixture.sh +++ b/contrib/teamcity/ci-fixture.sh @@ -24,5 +24,5 @@ } build_static_dependencies() { - "${DEVTOOLS_DIR}"/build_depends.sh + "${DEVTOOLS_DIR}"/build_depends.sh "$@" }