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

Merge branch 'master' of https://github.com/mapnik/mapnik

Browse source
This commit is contained in:
bergwerkgis 2016-09-05 14:00:34 +00:00
commit 49a1799d4f
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -92,11 +92,11 @@ script:
- export SCONSFLAGS='--debug=time' - export SCONSFLAGS='--debug=time'
- configure BENCHMARK=${BENCH} - configure BENCHMARK=${BENCH}
- cat config.log - cat config.log
# we limit the `make` to 35 min # we limit the `make` to 40 min
# to ensure that slow builds still upload their # to ensure that slow builds still upload their
# ccache results and therefore should be faster # ccache results and therefore should be faster
# (and might work) for the next build # (and might work) for the next build
- DURATION=2100 - DURATION=2400
- scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make - scripts/travis-command-wrapper.py -s "date" -i 120 --deadline=$(( $(date +%s) + ${DURATION} )) make
- make test - make test
- enabled ${COVERAGE} coverage - enabled ${COVERAGE} coverage

2
CHANGELOG.md
View file

@ -41,6 +41,8 @@ Released: xx-xx-xx
- GeoJSON - exposed `num_features_to_query` as datasource paramer (ref #3495) - GeoJSON - exposed `num_features_to_query` as datasource paramer (ref #3495)
- Replaced `boost::mpl::vector<Types...>` with `std::tuple<Types...>` (ref #3503) - Replaced `boost::mpl::vector<Types...>` with `std::tuple<Types...>` (ref #3503)
- BuildingSymbolizer - fixed closing segment of polygon in building symbolizer (ref #3505) - BuildingSymbolizer - fixed closing segment of polygon in building symbolizer (ref #3505)
- Update dependencies versions
- Fixed warnings when compiling with g++5
## 3.0.11 ## 3.0.11

2
scripts/time-header
View file

@ -6,4 +6,4 @@ set -o pipefail
CXXFLAGS="$(./utils/mapnik-config/mapnik-config --cflags)" CXXFLAGS="$(./utils/mapnik-config/mapnik-config --cflags)"
CXX="$(./utils/mapnik-config/mapnik-config --cxx)" CXX="$(./utils/mapnik-config/mapnik-config --cxx)"
echo "Time taken to compile '$(basename $1)':" echo "Time taken to compile '$(basename $1)':"
time ${CXX} $1 -I./test -I./deps/agg/include -Ideps -I./include $CXXFLAGS -o /tmp/header.out time ${CXX} $1 -I./test -I./deps/agg/include -Ideps -I./deps/mapbox/variant/include -I./include $CXXFLAGS -o /tmp/header.out