From 599ed18d58b966d2304bbd5c857eee0aa5c3fff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20Ka=CC=88fer?= Date: Mon, 18 Aug 2014 11:40:17 +0200 Subject: [PATCH] use cached dependencies for os x build --- setup-libraries.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/setup-libraries.sh b/setup-libraries.sh index 359e14e3d..4dd4bc5db 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -63,6 +63,16 @@ cd ./osx/ export CXX11=true if [ ${UNAME} = 'Darwin' ]; then + +if [ ! -z "${TRAVIS:-}" ]; then + if aws s3 cp s3://mapbox-gl-testing/dependencies/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz ./out/ ; then + rm -rf out/build-cpp11-libcpp-universal + tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz + fi +fi + +if [ -z "${TRAVIS:-}" -o ! -d out/build-cpp11-libcpp-universal ]; then + source iPhoneOS.sh if [ ! -f out/build-cpp11-libcpp-armv7-iphoneos/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi if [ ! -f out/build-cpp11-libcpp-armv7-iphoneos/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi @@ -101,6 +111,13 @@ source MacOSX.sh ./scripts/make_universal.sh +if [ ! -z "${TRAVIS:-}" ]; then + tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz out/build-cpp11-libcpp-universal + aws s3 cp out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz s3://mapbox-gl-testing/dependencies/ +fi + +fi + cd ../../ ./configure \ --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libcpp-universal/lib/pkgconfig \