|
 |
36df313 |
commit 46d4d1ed54f43b361369c75472e6453ba0357ea8
|
|
|
2168be5 |
Author: Tom Hughes <tom@compton.nu>
|
|
|
2168be5 |
Date: Mon Aug 18 14:30:51 2014 +0100
|
|
|
2168be5 |
|
|
|
2168be5 |
Patch out use of node-pre-gyp
|
|
|
2168be5 |
|
|
|
eaef427 |
diff --git a/bin/mapnik-index.js b/bin/mapnik-index.js
|
|
|
eaef427 |
index 6d0eeda..f293f6d 100755
|
|
|
eaef427 |
--- a/bin/mapnik-index.js
|
|
|
eaef427 |
+++ b/bin/mapnik-index.js
|
|
|
eaef427 |
@@ -2,9 +2,8 @@
|
|
|
eaef427 |
|
|
|
eaef427 |
'use strict';
|
|
|
eaef427 |
|
|
|
eaef427 |
-var binary = require('node-pre-gyp'),
|
|
|
eaef427 |
- path = require('path'),
|
|
|
eaef427 |
- bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
|
|
|
eaef427 |
+var path = require('path'),
|
|
|
eaef427 |
+ bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
|
|
|
eaef427 |
program = path.join(path.dirname(bindingPath), 'mapnik-index'),
|
|
|
eaef427 |
spawn = require('child_process').spawn,
|
|
|
eaef427 |
fs = require('fs');
|
|
|
eaef427 |
diff --git a/bin/mapnik-shapeindex.js b/bin/mapnik-shapeindex.js
|
|
|
eaef427 |
index a612777..e3a0c05 100755
|
|
|
eaef427 |
--- a/bin/mapnik-shapeindex.js
|
|
|
eaef427 |
+++ b/bin/mapnik-shapeindex.js
|
|
|
eaef427 |
@@ -2,9 +2,8 @@
|
|
|
eaef427 |
|
|
|
eaef427 |
'use strict';
|
|
|
eaef427 |
|
|
|
eaef427 |
-var binary = require('node-pre-gyp'),
|
|
|
eaef427 |
- path = require('path'),
|
|
|
eaef427 |
- bindingPath = binary.find(path.resolve(__dirname, '..', 'package.json')),
|
|
|
eaef427 |
+var path = require('path'),
|
|
|
eaef427 |
+ bindingPath = path.resolve(path.join(__dirname, 'binding/mapnik.node')),
|
|
|
eaef427 |
shapeindex = path.join(path.dirname(bindingPath), 'shapeindex'),
|
|
|
eaef427 |
spawn = require('child_process').spawn,
|
|
|
eaef427 |
fs = require('fs');
|
|
|
2168be5 |
diff --git a/lib/mapnik.js b/lib/mapnik.js
|
|
|
e54ca5a |
index 96328fe..120f046 100644
|
|
|
2168be5 |
--- a/lib/mapnik.js
|
|
|
2168be5 |
+++ b/lib/mapnik.js
|
|
|
eaef427 |
@@ -1,9 +1,8 @@
|
|
|
eaef427 |
"use strict";
|
|
|
eaef427 |
|
|
|
2168be5 |
-var binary = require('node-pre-gyp');
|
|
|
eaef427 |
var exists = require('fs').existsSync || require('path').existsSync;
|
|
|
2168be5 |
var path = require('path');
|
|
|
2168be5 |
-var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
|
|
|
2168be5 |
+var binding_path = path.resolve(path.join(__dirname,'binding/mapnik.node'));
|
|
|
2168be5 |
var settings_path = path.join(path.dirname(binding_path),'mapnik_settings.js');
|
|
|
2168be5 |
var settings = require(settings_path);
|
|
|
2168be5 |
|
|
|
7ae92d3 |
diff --git a/package.json b/package.json
|
|
|
36df313 |
index e98b9e5..474b42a 100644
|
|
|
7ae92d3 |
--- a/package.json
|
|
|
7ae92d3 |
+++ b/package.json
|
|
|
65ca52d |
@@ -43,7 +43,6 @@
|
|
|
7ae92d3 |
"dependencies": {
|
|
|
36df313 |
"mapnik-vector-tile": "1.1.2",
|
|
|
e54ca5a |
"nan": "~2.2.0",
|
|
|
65ca52d |
- "node-pre-gyp": "~0.6.25",
|
|
|
e54ca5a |
"protozero": "~1.3.0"
|
|
|
7ae92d3 |
},
|
|
|
65ca52d |
"bin": {
|