Blob Blame History Raw
commit 00a007014b80dc7df054626ef4d200594c9a2e7a
Author: Tom Hughes <tom@compton.nu>
Date:   Sat Sep 10 12:00:00 2016 +0100

    Build against system libraries

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