summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2017-02-23 12:19:04 +0100
committerKonstantin Käfer <mail@kkaefer.com>2017-02-23 22:15:57 +0100
commit6b0ad899b3ced4932cf600a4f89b2609512c98be (patch)
tree5d772f8fd0f193b06bdad9de147e59dd8d674789
parent87be62f9e4bbf990b63a1f4bed3939276cfd6a92 (diff)
downloadqtlocation-mapboxgl-6b0ad899b3ced4932cf600a4f89b2609512c98be.tar.gz
[node] adhere to node module naming requirements
https://nodejs.org/api/addons.html#addons_building specifies that "The module_name must match the filename of the final binary (excluding the .node suffix).". While the mismatch between `mapbox-gl-native` and `mapbox_gl_native` hasn't caused issues so far, we should play by the book.
-rw-r--r--cmake/node.cmake2
-rw-r--r--platform/node/index.js2
-rw-r--r--platform/node/test/js/require.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/node.cmake b/cmake/node.cmake
index 2dd4a66c38..b9a4f68ecc 100644
--- a/cmake/node.cmake
+++ b/cmake/node.cmake
@@ -49,7 +49,7 @@ target_add_mason_package(mbgl-node PRIVATE geojson)
add_custom_command(
TARGET mbgl-node
POST_BUILD
- COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:mbgl-node> ${CMAKE_SOURCE_DIR}/lib/mapbox-gl-native.node
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:mbgl-node> ${CMAKE_SOURCE_DIR}/lib/mapbox_gl_native.node
)
mbgl_platform_node()
diff --git a/platform/node/index.js b/platform/node/index.js
index 8c59023847..54ba5c0dc6 100644
--- a/platform/node/index.js
+++ b/platform/node/index.js
@@ -2,7 +2,7 @@
// Shim to wrap req.respond while preserving callback-passing API
-var mbgl = require('../../lib/mapbox-gl-native.node');
+var mbgl = require('../../lib/mapbox_gl_native.node');
var constructor = mbgl.Map.prototype.constructor;
var Map = function(options) {
diff --git a/platform/node/test/js/require.js b/platform/node/test/js/require.js
index 1528002c20..073ca742ad 100644
--- a/platform/node/test/js/require.js
+++ b/platform/node/test/js/require.js
@@ -1 +1 @@
-var mbgl = require('../../../../lib/mapbox-gl-native');
+var mbgl = require('../../../../lib/mapbox_gl_native');