Skip to content

Commit 9f0d98c

Browse files
authored
Merge pull request #788 from mapnik/mapnik-249d6cc
Mapnik 249d6cc
2 parents 848adfc + 3b89182 commit 9f0d98c

3 files changed

Lines changed: 115 additions & 120 deletions

File tree

install_mason.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ICU_VERSION="57.1"
1212

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

1818
if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
@@ -38,5 +38,5 @@ if [ ! -f ./mason_packages/.link/bin/mapnik-config ]; then
3838
# NOTE: sync this version with the `mapnik_version` in package.json (which is used for windows builds)
3939
# In the future we could pull from that version automatically if mason were to support knowing the right dep
4040
# versions to install automatically. Until then there is not much point since the deps are still hardcoded here.
41-
install mapnik 3.0.15
41+
install mapnik 249d6cc
4242
fi

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"url": "http://github.com/mapnik/node-mapnik",
55
"homepage": "http://mapnik.org",
66
"author": "Dane Springmeyer <dane@mapbox.com> (mapnik.org)",
7-
"version": "3.6.2",
8-
"mapnik_version":"v3.0.15",
7+
"version": "3.6.2-dev-249d6cc",
8+
"mapnik_version":"249d6cc",
99
"main": "./lib/mapnik.js",
1010
"binary": {
1111
"module_name": "mapnik",

0 commit comments

Comments
 (0)