From be8e2ceae44f6389cf2f4dfda992676bd6b8e258 Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Wed, 28 May 2014 21:07:49 -0700 Subject: [PATCH] [build] clear packages only on travis (needed to avoid caching them) --- .travis.yml | 2 ++ setup-libraries.sh | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2ca7779a9..cda0af771 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,8 @@ before_install: install: - ./setup-libraries.sh +- rm -rf mapnik-packaging/out/packages + before_script: - if [ ${CXX} = "g++" ]; then export CXX="g++-4.8" ; fi diff --git a/setup-libraries.sh b/setup-libraries.sh index 8d714b098..954c98070 100755 --- a/setup-libraries.sh +++ b/setup-libraries.sh @@ -77,8 +77,6 @@ source MacOSX.sh if [ ! -d out/build-cpp11-libcpp-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi echo ' ...done' -rm -rf out/packages - ./scripts/make_universal.sh cd ../../ @@ -96,8 +94,6 @@ source Linux.sh if [ ! -f out/build-cpp11-libstdcpp-gcc-x86_64/lib/libcurl.a ] ; then ./scripts/build_curl.sh ; fi if [ ! -d out/build-cpp11-libstdcpp-gcc-x86_64/include/boost ] ; then ./scripts/build_boost.sh `pwd`/../../src/ `pwd`/../../linux/ `pwd`/../../common/ ; fi -rm -rf out/packages - cd ../../ ./configure \ --pkg-config-root=`pwd`/mapnik-packaging/osx/out/build-cpp11-libstdcpp-gcc-x86_64/lib/pkgconfig \