Merge pull request #428 from mapbox/cache-osx-dependencies
Cache OS X dependencies
This commit is contained in:
@@ -20,4 +20,5 @@ elif [[ ${TRAVIS_OS_NAME} == "osx" ]]; then
|
||||
# install OS X dependencies
|
||||
#
|
||||
brew install autoconf automake libtool makedepend cmake pkg-config node git
|
||||
sudo pip install awscli
|
||||
fi
|
||||
|
||||
@@ -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 test -z "${TRAVIS:-}" || ! test -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 \
|
||||
|
||||
Reference in New Issue
Block a user