diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 18:36:28 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-10-10 18:36:28 -0400 |
| commit | e76d3e4a817d820d736462ce98af86da730ab849 (patch) | |
| tree | 15bc34998b45cbf4dc577a6c58dcd328426bd632 | |
| parent | b3d064d1bbdfce42f394e96c63371b7f313b60d0 (diff) | |
| parent | 6bd63c565eee2a41fdd5ccbc248426bd469e1809 (diff) | |
| download | qtlocation-mapboxgl-e76d3e4a817d820d736462ce98af86da730ab849.tar.gz | |
Merge branch 'master' into libuv-0.10-headless-display
Conflicts:
setup-libraries.sh
| -rwxr-xr-x | setup-libraries.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setup-libraries.sh b/setup-libraries.sh index 06a019b730..d367e45ca0 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -67,7 +67,7 @@ export CXX11=true if [ ${UNAME} = 'Darwin' ]; then -if [[ -n ${TRAVIS:-} ]]; then +if [[ ${TRAVIS:-} ]]; then if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libcpp-osx_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then rm -rf out/build-cpp11-libcpp-x86_64-macosx @@ -136,7 +136,7 @@ export LIBUV_VERSION=0.10.28 patch -p0 --forward < patches/curl-ios.diff || true echo "NOTE: One patch FAILURE is expected. The other should have been applied or ignored." -if [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then +if [[ ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID:-} && ${AWS_SECRET_ACCESS_KEY:-} ]] ; then tar -zcf out/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-universal aws s3 cp --acl public-read out/build-cpp11-libcpp-ios_${MP_HASH}_${DIR_HASH}.tar.gz s3://${AWS_S3_BUCKET}/dependencies/ tar -zcf out/build-cpp11-libcpp-osx_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libcpp-x86_64-macosx @@ -152,7 +152,7 @@ cd ../../ elif [ ${UNAME} = 'Linux' ]; then -if [[ -n ${TRAVIS:-} ]]; then +if [[ ${TRAVIS:-} ]]; then if aws s3 cp s3://${AWS_S3_BUCKET}/dependencies/build-cpp11-libstdcpp-gcc-x86_64-linux_${MP_HASH}_${DIR_HASH}.tar.gz ./out/ ; then rm -rf out/build-cpp11-libstdcpp-gcc-x86_64-linux tar -xzf out/build-cpp11-libstdcpp-gcc-x86_64-linux_${MP_HASH}_${DIR_HASH}.tar.gz @@ -169,7 +169,7 @@ 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 [[ -n ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID} && ${AWS_SECRET_ACCESS_KEY} ]] ; then +if [[ ${TRAVIS:-} && ${AWS_ACCESS_KEY_ID:-} && ${AWS_SECRET_ACCESS_KEY:-} ]] ; 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_${MP_HASH}_${DIR_HASH}.tar.gz out/build-cpp11-libstdcpp-gcc-x86_64-linux aws s3 cp --acl public-read out/build-cpp11-libstdcpp-gcc-x86_64-linux_${MP_HASH}_${DIR_HASH}.tar.gz s3://${AWS_S3_BUCKET}/dependencies/ |