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

Merge branch 'master' into geometry-refactor

Browse source
This commit is contained in:
artemp 2016-08-30 14:39:44 +01:00
commit f55b3b3bb3
6 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.travis.yml
View file

@ -29,7 +29,7 @@ matrix:
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
packages: [ 'libstdc++-5-dev', 'xutils'] packages: [ 'libstdc++-5-dev', 'xutils-dev']
- os: linux - os: linux
sudo: false sudo: false
compiler: ": clang-coverage" compiler: ": clang-coverage"
@ -37,7 +37,7 @@ matrix:
addons: addons:
apt: apt:
sources: [ 'ubuntu-toolchain-r-test'] sources: [ 'ubuntu-toolchain-r-test']
packages: ['libstdc++-5-dev', 'xutils' ] packages: ['libstdc++-5-dev', 'xutils-dev' ]
- os: osx - os: osx
compiler: ": clang-osx" compiler: ": clang-osx"
# https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions # https://docs.travis-ci.com/user/languages/objective-c/#Supported-OS-X-iOS-SDK-versions

6
CHANGELOG.md
View file

@ -36,7 +36,11 @@ Released: xx-xx-xx
- Added support for quantising small (less than 3 pixel) images (ref #3466) - Added support for quantising small (less than 3 pixel) images (ref #3466)
- Added support for natural logarithm function in expressions (ref #3475) - Added support for natural logarithm function in expressions (ref #3475)
- Improved logic determining if certain compiler features are available e.g `inheriting constructors` (MSVC) - Improved logic determining if certain compiler features are available e.g `inheriting constructors` (MSVC)
- GeoJSON - corrected quoting in `stringgifird` objects (ref #3491) - GeoJSON - corrected quoting in `stringify` objects (ref #3491)
- GeoJSON - ensured consistent ordering of attribute descriptors (ref #3494)
- GeoJSON - exposed `num_features_to_query` as datasource paramer (ref #3495)
- Replaced `boost::mpl::vector<Types...>` with `std::tuple<Types...>` (ref #3503)
- BuildingSymbolizer - fixed closing segment of polygon in building symbolizer (ref #3505)
## 3.0.11 ## 3.0.11

32
bootstrap.sh
View file

@ -11,7 +11,7 @@ todo
- shrink icu data - shrink icu data
' '
MASON_VERSION="7ed8931" MASON_VERSION="new-pkgs"
function setup_mason() { function setup_mason() {
if [[ ! -d ./.mason ]]; then if [[ ! -d ./.mason ]]; then
@ -19,7 +19,7 @@ function setup_mason() {
(cd ./.mason && git checkout ${MASON_VERSION}) (cd ./.mason && git checkout ${MASON_VERSION})
else else
echo "Updating to latest mason" echo "Updating to latest mason"
(cd ./.mason && git fetch && git checkout ${MASON_VERSION}) (cd ./.mason && git fetch && git checkout ${MASON_VERSION} && git pull)
fi fi
export PATH=$(pwd)/.mason:$PATH export PATH=$(pwd)/.mason:$PATH
export CXX=${CXX:-clang++} export CXX=${CXX:-clang++}
@ -39,6 +39,8 @@ function install() {
fi fi
fi fi
fi fi
# the rm here is to workaround https://github.com/mapbox/mason/issues/230
rm -f ./mason_packages/.link/mason.ini
mason link $1 $2 mason link $1 $2
} }
@ -47,21 +49,21 @@ ICU_VERSION="55.1"
function install_mason_deps() { function install_mason_deps() {
FAIL=0 FAIL=0
install ccache 3.2.4 & install ccache 3.2.4 &
install jpeg_turbo 1.4.0 libjpeg & install jpeg_turbo 1.5.0 libjpeg &
install libpng 1.6.20 libpng & install libpng 1.6.24 libpng &
install libtiff 4.0.4beta libtiff & install libtiff 4.0.6 libtiff &
install libpq 9.4.1 & install libpq 9.5.2 &
install sqlite 3.8.8.3 libsqlite3 & install sqlite 3.14.1 libsqlite3 &
install expat 2.1.0 libexpat & install expat 2.2.0 libexpat &
install icu ${ICU_VERSION} & install icu ${ICU_VERSION} &
install proj 4.8.0 libproj & install proj 4.9.2 libproj &
install pixman 0.32.6 libpixman-1 & install pixman 0.34.0 libpixman-1 &
install cairo 1.14.2 libcairo & install cairo 1.14.6 libcairo &
install protobuf 2.6.1 & install protobuf 2.6.1 &
# technically protobuf is not a mapnik core dep, but installing # technically protobuf is not a mapnik core dep, but installing
# here by default helps make mapnik-vector-tile builds easier # here by default helps make mapnik-vector-tile builds easier
install webp 0.5.0 libwebp & install webp 0.5.1 libwebp &
install gdal 1.11.2 libgdal & install gdal 2.1.1 libgdal &
install boost 1.61.0 & install boost 1.61.0 &
install boost_libsystem 1.61.0 & install boost_libsystem 1.61.0 &
install boost_libfilesystem 1.61.0 & install boost_libfilesystem 1.61.0 &
@ -71,8 +73,8 @@ function install_mason_deps() {
# here by default helps make python-mapnik builds easier # here by default helps make python-mapnik builds easier
install boost_libthread 1.61.0 & install boost_libthread 1.61.0 &
install boost_libpython 1.61.0 & install boost_libpython 1.61.0 &
install freetype 2.6 libfreetype & install freetype 2.6.5 libfreetype &
install harfbuzz 0.9.41 libharfbuzz & install harfbuzz 1.3.0 libharfbuzz &
for job in $(jobs -p) for job in $(jobs -p)
do do
wait $job || let "FAIL+=1" wait $job || let "FAIL+=1"

2
circle.yml
View file

@ -27,7 +27,7 @@ dependencies:
- sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
override: override:
- sudo apt-get update -y - sudo apt-get update -y
- sudo apt-get install -y libstdc++-5-dev xutils - sudo apt-get install -y libstdc++-5-dev xutils-dev
database: database:
pre: pre:

2
test/data

@ -1 +1 @@
Subproject commit fb1529e225b36f8a3077ad23f7005951a07c8a7e Subproject commit 6ce59adfc4f11b16a5dc0e2020c36dc614850989

2
test/data-visual

@ -1 +1 @@
Subproject commit 91bc22de33fb6bf438d94d3c0db8475a7633588e Subproject commit db7989be3a8b636c60c79356b9ba9ca579faa01d