|
 |
1761b53 |
commit 00a007014b80dc7df054626ef4d200594c9a2e7a
|
|
|
f6b04af |
Author: Tom Hughes <tom@compton.nu>
|
|
|
f6b04af |
Date: Sat Sep 10 12:00:00 2016 +0100
|
|
|
f6b04af |
|
|
|
f6b04af |
Build against system libraries
|
|
|
f6b04af |
|
|
|
f6b04af |
diff --git a/bin/mapnik-index.js b/bin/mapnik-index.js
|
|
|
1761b53 |
index 0e18ada5..04430dcc 100755
|
|
|
f6b04af |
--- a/bin/mapnik-index.js
|
|
|
f6b04af |
+++ b/bin/mapnik-index.js
|
|
|
f6b04af |
@@ -3,7 +3,7 @@
|
|
|
f6b04af |
'use strict';
|
|
|
f6b04af |
|
|
|
f6b04af |
var path = require('path'),
|
|
|
f6b04af |
- bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
|
|
|
f6b04af |
+ bindingPath = path.resolve(path.join(__dirname, '..', 'lib', 'binding', 'mapnik.node')),
|
|
|
f6b04af |
program = path.join(path.dirname(bindingPath), 'bin', 'mapnik-index'),
|
|
|
f6b04af |
spawn = require('child_process').spawn,
|
|
|
f6b04af |
fs = require('fs');
|
|
|
f6b04af |
diff --git a/bin/mapnik-shapeindex.js b/bin/mapnik-shapeindex.js
|
|
|
1761b53 |
index 0d73b7f8..d4fed9f2 100755
|
|
|
f6b04af |
--- a/bin/mapnik-shapeindex.js
|
|
|
f6b04af |
+++ b/bin/mapnik-shapeindex.js
|
|
|
f6b04af |
@@ -3,7 +3,7 @@
|
|
|
f6b04af |
'use strict';
|
|
|
f6b04af |
|
|
|
f6b04af |
var path = require('path'),
|
|
|
f6b04af |
- bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
|
|
|
f6b04af |
+ bindingPath = path.resolve(path.join(__dirname, '..', 'lib', 'binding', 'mapnik.node')),
|
|
|
f6b04af |
shapeindex = path.join(path.dirname(bindingPath), 'bin', 'shapeindex'),
|
|
|
f6b04af |
spawn = require('child_process').spawn,
|
|
|
f6b04af |
fs = require('fs');
|
|
|
f6b04af |
diff --git a/binding.gyp b/binding.gyp
|
|
|
1761b53 |
index 6bdf3b18..79cfa70b 100644
|
|
|
f6b04af |
--- a/binding.gyp
|
|
|
f6b04af |
+++ b/binding.gyp
|
|
|
1761b53 |
@@ -34,16 +34,8 @@
|
|
|
f6b04af |
4267
|
|
|
f6b04af |
],
|
|
|
f6b04af |
'include_dirs': [
|
|
|
f6b04af |
- './mason_packages/.link/include/',
|
|
|
f6b04af |
- './mason_packages/.link/include/freetype2',
|
|
|
f6b04af |
- './mason_packages/.link/include/cairo',
|
|
|
f6b04af |
'./src',
|
|
|
f6b04af |
"
|
|
|
f6b04af |
- # TODO: move these to mason packages once we have a minimal windows client for mason (@springmeyer)
|
|
|
f6b04af |
- # https://github.com/mapbox/mason/issues/396
|
|
|
f6b04af |
- "./deps/geometry/include/",
|
|
|
f6b04af |
- "./deps/wagyu/include/",
|
|
|
f6b04af |
- "
|
|
|
f6b04af |
"
|
|
|
f6b04af |
],
|
|
|
f6b04af |
'defines': [
|
|
|
1761b53 |
@@ -119,25 +111,5 @@
|
|
|
1761b53 |
}]
|
|
|
f6b04af |
]
|
|
|
f6b04af |
},
|
|
|
f6b04af |
- {
|
|
|
f6b04af |
- 'target_name': 'action_after_build',
|
|
|
f6b04af |
- 'type': 'none',
|
|
|
f6b04af |
- 'dependencies': [ '<(module_name)' ],
|
|
|
f6b04af |
- 'hard_dependency': 1,
|
|
|
f6b04af |
- 'conditions': [
|
|
|
f6b04af |
- ['OS!="win"',
|
|
|
f6b04af |
- {
|
|
|
f6b04af |
- 'actions': [
|
|
|
f6b04af |
- {
|
|
|
f6b04af |
- 'action_name': 'postinstall',
|
|
|
f6b04af |
- 'inputs': ['./scripts/postinstall.sh'],
|
|
|
f6b04af |
- 'outputs': ['./lib/binding/mapnik'],
|
|
|
f6b04af |
- 'action': ['./scripts/postinstall.sh']
|
|
|
f6b04af |
- }
|
|
|
f6b04af |
- ]
|
|
|
f6b04af |
- }
|
|
|
f6b04af |
- ]
|
|
|
f6b04af |
- ]
|
|
|
f6b04af |
- },
|
|
|
f6b04af |
]
|
|
|
f6b04af |
}
|
|
|
f6b04af |
diff --git a/lib/mapnik.js b/lib/mapnik.js
|
|
|
1761b53 |
index ef64c92e..57e783da 100644
|
|
|
f6b04af |
--- a/lib/mapnik.js
|
|
|
f6b04af |
+++ b/lib/mapnik.js
|
|
|
f6b04af |
@@ -2,7 +2,7 @@
|
|
|
f6b04af |
|
|
|
f6b04af |
var exists = require('fs').existsSync || require('path').existsSync;
|
|
|
f6b04af |
var path = require('path');
|
|
|
f6b04af |
-var binding_path = path.resolve(path.join(__dirname,'binding/mapnik.node'));
|
|
|
f6b04af |
+var binding_path = path.resolve(path.join(__dirname, 'binding', 'mapnik.node'));
|
|
|
f6b04af |
var settings_path = path.join(path.dirname(binding_path),'mapnik_settings.js');
|
|
|
f6b04af |
var settings = require(settings_path);
|
|
|
f6b04af |
|