port 3614 to 3.1/master

.travis.yml

@@ -60,8 +60,7 @@ before_install:
      rvm get head || true
    fi
  - source scripts/travis-common.sh
- - export PYTHONUSERBASE=$(pwd)/mason_packages/.link
+ - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PATH}
- - export PATH=${PREFIX}/bin:$(pwd)/mason_packages/.link/bin:${PYTHONUSERBASE}/bin:${PATH}
  - export COVERAGE=${COVERAGE:-false}
  - export MASON_PUBLISH=${MASON_PUBLISH:-false}
  - export BENCH=${BENCH:-false}
@@ -70,8 +69,6 @@ before_install:
  - git_submodule_update --init --depth=10
 
 install:
- - on 'linux' export PYTHONPATH=${PYTHONUSERBASE}/lib/python2.7/site-packages
- - on 'osx' export PYTHONPATH=${PYTHONUSERBASE}/lib/python/site-packages
  - on 'osx' export DATA_PATH=$(brew --prefix)/var/postgres
  - on 'osx' rm -rf ${DATA_PATH}
  - on 'osx' initdb ${DATA_PATH} -E utf8
@@ -80,7 +77,8 @@ install:
  - on 'osx' createuser -s postgres
  - psql -c 'create database template_postgis;' -U postgres
  - psql -c 'create extension postgis;' -d template_postgis -U postgres
- - enabled ${COVERAGE} pip install --user cpp-coveralls
+ - enabled ${COVERAGE} curl -S -f https://codecov.io/bash -o codecov
+ - enabled ${COVERAGE} chmod +x codecov
 
 before_script:
  - source bootstrap.sh

bootstrap.sh

@@ -11,7 +11,7 @@ todo
 - shrink icu data
 '
 
-MASON_VERSION="3e2944322"
+MASON_VERSION="v0.8.0"
 
 function setup_mason() {
     if [[ ! -d ./.mason ]]; then
@@ -19,7 +19,7 @@ function setup_mason() {
         (cd ./.mason && git checkout ${MASON_VERSION})
     else
         echo "Updating to latest mason"
-        (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull)
+        (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull origin ${MASON_VERSION})
     fi
     export PATH=$(pwd)/.mason:$PATH
     export CXX=${CXX:-clang++}
@@ -47,42 +47,34 @@ function install() {
 ICU_VERSION="55.1"
 
 function install_mason_deps() {
-    FAIL=0
+    install ccache 3.3.0
-    install ccache 3.3.0 &
+    install zlib 1.2.8
-    install zlib system &
+    install jpeg_turbo 1.5.1 libjpeg
-    install jpeg_turbo 1.5.0 libjpeg &
+    install libpng 1.6.28 libpng
-    install libpng 1.6.24 libpng &
+    install libtiff 4.0.7 libtiff
-    install libtiff 4.0.6 libtiff &
+    install libpq 9.6.1
-    install libpq 9.5.2 &
+    install sqlite 3.16.2 libsqlite3
-    install sqlite 3.14.1 libsqlite3 &
+    install expat 2.2.0 libexpat
-    install expat 2.2.0 libexpat &
+    install icu ${ICU_VERSION}
-    install icu ${ICU_VERSION} &
+    install proj 4.9.3 libproj
-    install proj 4.9.2 libproj &
+    install pixman 0.34.0 libpixman-1
-    install pixman 0.34.0 libpixman-1 &
+    install cairo 1.14.8 libcairo
-    install cairo 1.14.6 libcairo &
+    install protobuf 3.2.0
-    install protobuf 2.6.1 &
     # technically protobuf is not a mapnik core dep, but installing
     # here by default helps make mapnik-vector-tile builds easier
-    install webp 0.5.1 libwebp &
+    install webp 0.6.0 libwebp
-    install gdal 2.1.1 libgdal &
+    install libgdal 2.1.3 libgdal
-    install boost 1.61.0 &
+    install boost 1.63.0
-    install boost_libsystem 1.61.0 &
+    install boost_libsystem 1.63.0
-    install boost_libfilesystem 1.61.0 &
+    install boost_libfilesystem 1.63.0
-    install boost_libprogram_options 1.61.0 &
+    install boost_libprogram_options 1.63.0
-    install boost_libregex_icu 1.61.0 &
+    install boost_libregex_icu 1.63.0
     # technically boost thread and python are not a core dep, but installing
     # here by default helps make python-mapnik builds easier
-    install boost_libthread 1.61.0 &
+    install boost_libthread 1.63.0
-    install boost_libpython 1.61.0 &
+    install boost_libpython 1.63.0
-    install freetype 2.6.5 libfreetype &
+    install freetype 2.7.1 libfreetype
-    install harfbuzz 1.3.0 libharfbuzz &
+    install harfbuzz 1.4.4-ft libharfbuzz
-    for job in $(jobs -p)
-    do
-        wait $job || let "FAIL+=1"
-    done
-    if [[ "$FAIL" != "0" ]]; then
-        exit ${FAIL}
-    fi
 }
 
 MASON_LINKED_ABS=$(pwd)/mason_packages/.link

scripts/travis-common.sh

@@ -46,15 +46,6 @@ git_submodule_update () {
     git submodule update "$@"
 }
 
-# install and call pip
-pip () {
-    if ! which pip >/dev/null; then
-        easy_install --user pip && \
-        export PATH="$HOME/Library/Python/2.7/bin:$PATH"
-    fi
-    command pip "$@"
-}
-
 # commit_message_contains TEXT
 #   - returns 0 (true) if TEXT is found in commit message
 #   - case-insensitive, plain-text search, not regex
@@ -92,13 +83,7 @@ configure () {
 }
 
 coverage () {
-    ./mason_packages/.link/bin/cpp-coveralls \
+    ./codecov -x "llvm-cov gcov" -Z
-        --gcov ${LLVM_COV} \
-        --exclude mason_packages \
-        --exclude .sconf_temp --exclude benchmark --exclude deps \
-        --exclude scons --exclude test --exclude demo --exclude docs \
-        --exclude fonts \
-        > /dev/null
 }
 
 trigger_downstream() {