Skip to content

Commit

Permalink
Merge pull request #788 from mapnik/mapnik-249d6cc
Browse files Browse the repository at this point in the history
Mapnik 249d6cc
  • Loading branch information
artemp authored Jul 19, 2017
2 parents 848adfc + 3b89182 commit 9f0d98c
Show file tree
Hide file tree
Showing 3 changed files with 115 additions and 120 deletions.
4 changes: 2 additions & 2 deletions install_mason.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ ICU_VERSION="57.1"

if [ ! -f ./mason/mason.sh ]; then
mkdir -p ./mason
curl -sSfL https://github.com/mapbox/mason/archive/c1948184d9430226e36f1bc1f8f081268b6bc2ba.tar.gz | tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=./mason
curl -sSfL https://github.com/mapbox/mason/archive/e319a75b05838ca99bce1745f9d6c2fde1139b16.tar.gz | tar --gunzip --extract --strip-components=1 --exclude="*md" --exclude="test*" --directory=./mason
fi

if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
Expand All @@ -38,5 +38,5 @@ if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
# NOTE: sync this version with the `mapnik_version` in package.json (which is used for windows builds)
# In the future we could pull from that version automatically if mason were to support knowing the right dep
# versions to install automatically. Until then there is not much point since the deps are still hardcoded here.
install mapnik 3.0.15
install mapnik 249d6cc
fi
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"url": "http://github.com/mapnik/node-mapnik",
"homepage": "http://mapnik.org",
"author": "Dane Springmeyer <[email protected]> (mapnik.org)",
"version": "3.6.2",
"mapnik_version":"v3.0.15",
"version": "3.6.2-dev-249d6cc",
"mapnik_version":"249d6cc",
"main": "./lib/mapnik.js",
"binary": {
"module_name": "mapnik",
Expand Down
Loading

0 comments on commit 9f0d98c

Please sign in to comment.