diff --git a/setup-libraries.sh b/setup-libraries.sh index 3642d91ff..33ef2a3d4 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -96,6 +96,19 @@ cd ../../ elif [ ${UNAME} = 'Linux' ]; then +if [ ! -z "${TRAVIS:-}" ]; then + echo "[default]" > ~/.s3cfg + echo "use_https = True" >> ~/.s3cfg + echo "access_key = $AWS_ACCESS_KEY_ID" >> ~/.s3cfg + echo "secret_key = $AWS_SECRET_ACCESS_KEY" >> ~/.s3cfg + + s3cmd sync --config=~/.s3cfg s3://mapbox-gl-testing/dependencies/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ./out/ + if [ -f out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ] ; then + rm -rf out/build-cpp11-libstdcpp-gcc-x86_64-linux + tar -xzf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz + fi +fi + source Linux.sh if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libglfw3.a ] ; then ./scripts/build_glfw.sh ; fi if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi @@ -104,6 +117,14 @@ source Linux.sh if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/libboost_regex.a ] ; then ./scripts/build_boost.sh --with-regex ; fi +if [ ! -z "${TRAVIS:-}" ]; then + if ! tar --compare -zf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz ; then + tar -zcf out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz out/build-cpp11-libstdcpp-gcc-x86_64-linux + s3cmd sync --config=~/.s3cfg out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://mapbox-gl-testing/dependencies/ + fi + rm ~/.s3cfg +fi + cd ../../ ./configure \ --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64-linux/lib/pkgconfig \