feat: readding MESSAGE_PATHS. introducing an override to specify an a…

…bs path for js messages
6RiverSystems · Feb 14, 2020 · 437bb17 · 437bb17
1 parent 834c972
commit 437bb17
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/src/ros_msg_utils/index.js b/src/ros_msg_utils/index.js
@@ -7,5 +7,6 @@ module.exports = {
   Find: MessageCache.Find,
   CMAKE_PREFIX_PATH: MessageCache.CMAKE_PREFIX_PATH,
   CMAKE_PATHS: MessageCache.CMAKE_PATHS,
+  MESSAGE_PATH: MessageCache.MESSAGE_PATH,
   packageMap: MessageCache.packageMap
 };
diff --git a/src/ros_msg_utils/lib/message_cache.js b/src/ros_msg_utils/lib/message_cache.js
@@ -20,8 +20,11 @@
 const fs = require('fs');
 const path = require('path');
 
-const CMAKE_PREFIX_PATH = process.env.CMAKE_PREFIX_PATH;
+// before requiring this module, set the environment variable: process.env.JS_MESSAGE_ABS_PATH_OVERRIDE
+// in order to to provide an absolute path to the directory containing all projects where generated JS ros messages are located
+const CMAKE_PREFIX_PATH = process.env.JS_MESSAGE_ABS_PATH_OVERRIDE ? process.env.JS_MESSAGE_ABS_PATH_OVERRIDE : process.env.CMAKE_PREFIX_PATH;
 const cmakePaths = CMAKE_PREFIX_PATH.split(path.delimiter);
+const jsMsgPath = path.join('share', 'gennodejs', 'ros');
 
 //-----------------------------------------------------------------------
 //  Search through the CMAKE_PREFIX_PATH for generated javascript messages.
@@ -31,7 +34,13 @@ const cmakePaths = CMAKE_PREFIX_PATH.split(path.delimiter);
 //-----------------------------------------------------------------------
 const packagePaths = {};
 cmakePaths.forEach((cmakePath) => {
-  const dirPath = cmakePath;
+  let dirPath = null;
+  if(JS_MESSAGE_ABS_PATH_OVERRIDE) {
+    dirPath = cmakePath;
+  }
+  else {
+    dirPath = path.join(cmakePath, jsMsgPath);
+  }
   try {
     let msgPackages = fs.readdirSync(dirPath);
     msgPackages.forEach((msgPackage) => {
@@ -58,5 +67,6 @@ module.exports = {
 
   CMAKE_PREFIX_PATH,
   CMAKE_PATHS: cmakePaths,
+  MESSAGE_PATH: jsMsgPath,
   packageMap: Object.assign({}, packagePaths)
 };
diff --git a/src/utils/message_utils.js b/src/utils/message_utils.js
@@ -91,7 +91,10 @@ function copyFile(from, to, replaceCallback) {
 
 let MessageUtils = {
   getTopLevelMessageDirectory() {
-    return ros_msg_utils.CMAKE_PATHS[0];
+    if(process.env.JS_MESSAGE_ABS_PATH_OVERRIDE) {
+      return process.env.JS_MESSAGE_ABS_PATH_OVERRIDE;
+    }
+    return path.join(ros_msg_utils.CMAKE_PATHS[0], ros_msg_utils.MESSAGE_PATH);
   },
 
   flatten(outputDir) {