sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re-enable gcc, more JOBS, less boost

Browse source
This commit is contained in:
Dane Springmeyer 2014-09-30 17:05:34 -07:00
parent dfc7ba86d3
commit e392feeec2
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
.travis.yml
View file

@ -2,7 +2,7 @@ language: cpp
compiler:
- clang
# - gcc
- gcc
env:
matrix:
@ -17,6 +17,8 @@ before_install:
- sudo apt-get -qq purge postgis* postgresql*
- sudo apt-add-repository -y ppa:cartodb/postgresql-9.3
- sudo apt-add-repository -y ppa:cartodb/gis
# we need at least g++-4.7 for c++11 features
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo rm -Rf /var/lib/postgresql /etc/postgresql
- sudo apt-get update -qq
- sudo apt-get install -q postgresql-9.3-postgis-2.1
@ -26,11 +28,8 @@ before_install:
- sudo service postgresql restart
install:
- sudo add-apt-repository -y ppa:boost-latest/ppa
# we need at least g++-4.7 for c++11 features
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
- sudo apt-get install -y ttf-wqy-microhei make libstdc++6 libstdc++-4.8-dev valgrind boost1.55 python-nose libicu-dev libproj-dev libcairo-dev python-cairo-dev libcairo-dev python-cairo-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libsqlite3-dev
- sudo apt-get purge libboost1.46-dev
- sudo apt-get install -y ttf-wqy-microhei make libstdc++6 libstdc++-4.8-dev valgrind libboost-python1.48-dev libboost-thread1.48-dev libboost-filesystem1.48-dev libboost-regex1.48-dev libboost-program-options1.48-dev python-nose libicu-dev libproj-dev libcairo-dev python-cairo-dev libcairo-dev python-cairo-dev libpng-dev libjpeg-dev libtiff-dev libwebp-dev libz-dev libfreetype6-dev libxml2-dev libsqlite3-dev
before_script:
- psql -U postgres -c 'create database template_postgis'
@ -45,8 +44,8 @@ before_script:
script:
- ./configure CXX="${CXX}" CC="${CC}" CUSTOM_CXXFLAGS="${CUSTOM_CXXFLAGS}" CUSTOM_LDFLAGS="${CUSTOM_LDFLAGS}" XML_PARSER="${XML_PARSER}" ENABLE_LOG="${ENABLE_LOG}" DEBUG="${DEBUG}" DEMO="${DEMO}" BENCHMARK="${BENCHMARK}" CPP_TESTS=True CAIRO=True FAST=True || cat config.log
- if [[ "${DEBUG}" == true ]]; then JOBS=2 make; else JOBS=6 make; fi;
- if [[ "${DEBUG}" == true ]]; then JOBS=4 make; else JOBS=8 make; fi;
- git clone https://github.com/mapbox/mapnik-test-data tests/data/mapnik-test-data
- make test
- JOBS=${JOBS} make test
- source localize.sh && make grind
- if [[ ${BENCHMARK} != False ]]; then make bench; fi;