[build] clear packages only on travis (needed to avoid caching them)

This commit is contained in:
Dane Springmeyer
2014-05-28 21:07:49 -07:00
parent bc9847bde8
commit be8e2ceae4
2 changed files with 2 additions and 4 deletions

View File

@@ -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

View File

@@ -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 \