Merge pull request #11 from RethinkRobotics-opensource/revert_shared_base_files

Revert shared base files

Author: rethink-rlinsalata

cmake/gennodejs-extras.cmake.em

@@ -44,17 +44,14 @@ macro(_generate_srv_nodejs ARG_PKG ARG_SRV ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPU
   _generate_nodejs(${ARG_PKG} ${ARG_SRV} "${ARG_IFLAGS}" "${ARG_MSG_DEPS}" "${ARG_GEN_OUTPUT_DIR}/srv")
 endmacro()
 
-set(base_files
-  "${JS_FILES_DIR}/base_serialize.js"
-  "${JS_FILES_DIR}/base_deserialize.js"
-  "${JS_FILES_DIR}/find.js")
-
 macro(_generate_module_nodejs ARG_PKG ARG_GEN_OUTPUT_DIR ARG_GENERATED_FILES)
-    file(COPY ${base_files} DESTINATION "${ARG_GEN_OUTPUT_DIR}/../..")
-endmacro()
+  set(base_files
+    "${JS_FILES_DIR}/base_serialize.js"
+    "${JS_FILES_DIR}/base_deserialize.js"
+    "${JS_FILES_DIR}/find.js")
 
-install(FILES ${base_files}
-  DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/gennodejs)
+    file(COPY ${base_files} DESTINATION ${ARG_GEN_OUTPUT_DIR})
+endmacro()
 
 set(node_js_INSTALL_DIR share/gennodejs)
 set(gennodejs_INSTALL_DIR ${node_js_INSTALL_DIR}/ros)

src/gennodejs/generate.py

@@ -232,9 +232,9 @@ def write_requires(s, spec, previous_packages=None, prev_deps=None, isSrv=False)
     if previous_packages is None:
         s.write('"use strict";')
         s.newline()
-        s.write('let _serializer = require(\'../../../base_serialize.js\');')
-        s.write('let _deserializer = require(\'../../../base_deserialize.js\');')
-        s.write('let _finder = require(\'../../../find.js\');')
+        s.write('let _serializer = require(\'../base_serialize.js\');')
+        s.write('let _deserializer = require(\'../base_deserialize.js\');')
+        s.write('let _finder = require(\'../find.js\');')
         previous_packages = {}
     if prev_deps is None:
         prev_deps = []