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

Merge branch 'master' into geobuf

Browse source
This commit is contained in:
artemp 2015-01-30 19:17:36 +01:00
commit 822581977d
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
bootstrap.sh
View file

@ -15,17 +15,15 @@ todo
'
function setup_mason() {
if [[ -d ~/.mason ]]; then
export PATH=~/.mason:$PATH
if [[ $(uname -s) == 'Linux' ]]; then source ~/.mason/scripts/setup_cpp11_toolchain.sh; fi
if [[ ! -d ./.mason ]]; then
git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
else
if [[ ! -d ./.mason ]]; then
git clone --depth 1 https://github.com/mapbox/mason.git ./.mason
fi
if [[ $(uname -s) == 'Linux' ]]; then source ~/.mason/scripts/setup_cpp11_toolchain.sh; fi
export MASON_DIR=$(pwd)/.mason
export PATH=$(pwd)/.mason:$PATH
echo "Updating to latest mason"
(cd ./.mason && git pull)
fi
export MASON_DIR=$(pwd)/.mason
if [[ $(uname -s) == 'Linux' ]]; then source ./.mason/scripts/setup_cpp11_toolchain.sh; fi
export PATH=$(pwd)/.mason:$PATH
export CXX=${CXX:-clang++}
export CC=${CC:-clang}
}
@ -43,7 +41,7 @@ function install_mason_deps() {
ip harfbuzz 2cd5323 $MASON_PLATFORM_ID
ip jpeg_turbo 1.4.0 $MASON_PLATFORM_ID
ip libxml2 2.9.2 $MASON_PLATFORM_ID
ip libpng 1.6.13 $MASON_PLATFORM_ID
ip libpng 1.6.16 $MASON_PLATFORM_ID
ip webp 0.4.2 $MASON_PLATFORM_ID
ip icu 54.1 $MASON_PLATFORM_ID
ip proj 4.8.0 $MASON_PLATFORM_ID
@ -56,7 +54,7 @@ function install_mason_deps() {
ip boost_libregex 1.57.0 $MASON_PLATFORM_ID
ip boost_libpython 1.57.0 $MASON_PLATFORM_ID
ip libpq 9.4.0 $MASON_PLATFORM_ID
ip sqlite 3.8.6 $MASON_PLATFORM_ID
ip sqlite 3.8.8.1 $MASON_PLATFORM_ID
ip gdal 1.11.1 $MASON_PLATFORM_ID
ip expat 2.1.0 $MASON_PLATFORM_ID
ip pixman 0.32.6 $MASON_PLATFORM_ID
@ -138,6 +136,9 @@ function main() {
setup_nose
make_config
setup_runtime_settings
echo "Ready, now run:"
echo ""
echo " ./configure && make"
}
main

2
include/mapnik/json/feature_collection_grammar.hpp
View file

@ -77,7 +77,7 @@ struct feature_collection_grammar :
qi::rule<Iterator, qi::locals<feature_ptr,int>, void(context_ptr const& ctx, std::size_t, FeatureCallback&), space_type> feature;
qi::rule<Iterator, qi::locals<feature_ptr,int>, void(context_ptr const& ctx, std::size_t, FeatureCallback&), space_type> feature_from_geometry;
// phoenix functions
phoenix::function<extract_geometry> extract_geometry;
phoenix::function<json::extract_geometry> extract_geometry;
phoenix::function<apply_feature_callback> on_feature;
};