diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-26 16:55:08 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-08-26 16:55:08 -0400 |
| commit | 050b00cb5898af5d1ea82d8dd94878eb76da7faf (patch) | |
| tree | f453add00f563c91ee1b188bf61939b940b5b707 /setup-libraries.sh | |
| parent | 7ae3b8e8ee5f59481fb8373df1d17d25cccce2f0 (diff) | |
| parent | 60f7813544e4e49ef2cabcab493ea2903d888f19 (diff) | |
| download | qtlocation-mapboxgl-050b00cb5898af5d1ea82d8dd94878eb76da7faf.tar.gz | |
Merge branch 'master' into libuv010
Conflicts:
setup-libraries.sh
Diffstat (limited to 'setup-libraries.sh')
| -rwxr-xr-x | setup-libraries.sh | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/setup-libraries.sh b/setup-libraries.sh index bcf318ae81..e442333f49 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -51,7 +51,8 @@ set -u NODE=$(which node) NPM=$(which npm) -MP_HASH="c07b197" +MP_HASH="e741a075d28812e5d16b581e1540248fe19c52ce" +DIR_HASH=$(echo `pwd` | git hash-object --stdin) if [ ! -d 'mapnik-packaging/' ]; then git clone https://github.com/mapnik/mapnik-packaging.git fi @@ -66,9 +67,9 @@ export CXX11=true if [ ${UNAME} = 'Darwin' ]; then if [ ! -z "${TRAVIS:-}" ]; then - if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz ./out/ ; then + if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then rm -rf out/build-cpp11-libcpp-universal - tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}.tar.gz + tar -xzf out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz fi fi @@ -82,14 +83,14 @@ export LIBUV_VERSION=0.10.28 source iPhoneOSs.sh export LIBUV_VERSION=0.10.28 - if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneos/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi - if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneos/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi + if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi + if [ ! -f out/build-cpp11-libcpp-armv7s-iphoneoss/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi echo ' ...done' source iPhoneOS64.sh export LIBUV_VERSION=0.10.28 - if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi - if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi + if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libpng.a ] ; then ./scripts/build_png.sh ; fi + if [ ! -f out/build-cpp11-libcpp-arm64-iphoneos64/lib/libuv.a ] ; then ./scripts/build_libuv.sh ; fi echo ' ...done' source iPhoneSimulator.sh @@ -117,9 +118,9 @@ export LIBUV_VERSION=0.10.28 ./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://${AWS_S3_BUCKET}/dependencies/ +if [[ $TRAVIS_PULL_REQUEST = "false" ]]; then + tar -zcf out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-universal + aws s3 cp --acl public-read out/build-cpp11-libcpp-universal_${MP_HASH}_${DIR_HASH}.tar.gz s3://${AWS_S3_BUCKET}/dependencies/ fi fi @@ -149,10 +150,10 @@ export LIBUV_VERSION=0.10.28 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 [[ $TRAVIS_PULL_REQUEST = "false" ]]; 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 - aws s3 cp out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://${AWS_S3_BUCKET}/dependencies/ + aws s3 cp --acl public-read out/build-cpp11-libstdcpp-gcc-x86_64-linux.tar.gz s3://${AWS_S3_BUCKET}/dependencies/ fi fi |