npmpkg: Fix package.json having invalid main property

Fixes #48

Signed-off-by: Brendan Le Foll <brendan.le.foll@intel.com>

diff --git a/src/javascript/CMakeLists.txt b/src/javascript/CMakeLists.txt
index a170094..61923ad 100644 (file)
--- a/src/javascript/CMakeLists.txt
+++ b/src/javascript/CMakeLists.txt
@@ -58,6 +58,8 @@ add_custom_command (TARGET npmpkg POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_BINARY_DIR}/src/version.c ${CMAKE_SOURCE_DIR}/src
         COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_SOURCE_DIR}
+        COMMAND sed -i "'s/mraa.node/build\\/Release\\/mraa.node/'"
+        ${CMAKE_SOURCE_DIR}/package.json
         COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_CURRENT_BINARY_DIR}/binding.gyp ${CMAKE_SOURCE_DIR}
         COMMAND ${CMAKE_COMMAND} -E copy

diff --git a/src/javascript/binding.gyp.cmake b/src/javascript/binding.gyp.cmake
index 54beb08..ba882db 100644 (file)
--- a/src/javascript/binding.gyp.cmake
+++ b/src/javascript/binding.gyp.cmake
@@ -12,7 +12,8 @@
       'cflags_cc!': [ '-fno-rtti', '-fno-exceptions' ],
       'cflags!': [ '-fno-exceptions' ],
       'defines' : [ 'SWIG',
-                    'SWIGNODE' ],
+                    'SWIGNODE',
+                   'BUILDING_NODE_EXTENSION=1' ],
     }
   ]
 }

diff --git a/src/javascript/package.json.cmake b/src/javascript/package.json.cmake
index 0960bf8..ee6225c 100644 (file)
--- a/src/javascript/package.json.cmake
+++ b/src/javascript/package.json.cmake
@@ -3,7 +3,7 @@
   "description": "IO library that helps you use I2c, SPI, gpio, uart, pwm, analog inputs (aio) and more on a number of platforms such as the Intel galileo, the Intel edison and others",
   "keywords":["gpio", "edison","galileo","io", "mraajs", "spi", "i2c", "minnow", "intel"],
   "homepage": "http://github.com/intel-iot-devkit/mraa",
-  "main" : "./mraa.node",
+  "main" : "build/Release/mraa.node",
   "engines": {
     "node": ">= 1.0.x"
   },