gennodejs name-switch

CHANGELOG.rst

@@ -1,5 +1,5 @@
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Changelog for package genjs
+Changelog for package gennodejs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 1.0.0 (2016-4-19)

CMakeLists.txt

@@ -1,23 +1,23 @@
 cmake_minimum_required(VERSION 2.8.3)
-project(genjs)
+project(gennodejs)
 find_package(catkin REQUIRED COMPONENTS genmsg)
 
 catkin_package(
   CATKIN_DEPENDS genmsg
-  CFG_EXTRAS genjs-extras.cmake
+  CFG_EXTRAS gennodejs-extras.cmake
 )
 
 add_subdirectory(scripts)
 
-file(WRITE ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/genjs "JAVASCRIPT")
-install(FILES ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/genjs
+file(WRITE ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/gennodejs "JAVASCRIPT")
+install(FILES ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/gennodejs
   DESTINATION ${GENMSG_LANGS_DESTINATION})
 
 # install base serialization, deserialization files
 set(base_files
-  src/genjs/base_serialize.js
-  src/genjs/base_deserialize.js
-  src/genjs/find.js)
+  src/gennodejs/base_serialize.js
+  src/gennodejs/base_deserialize.js
+  src/gennodejs/find.js)
 
 file(COPY ${base_files} DESTINATION ${CATKIN_DEVEL_PREFIX}/share/node_js)
 install(FILES ${base_files}

README.md

@@ -1 +1 @@
-# genjs
+# gennodejs

cmake/gennodejs-extras.cmake.em

@@ -0,0 +1,49 @@
+@[if DEVELSPACE]@
+# bin variable in develspace
+set(GENNODEJS_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_nodejs.py")
+@[else]@
+# bin variable in installspace
+set(GENNODEJS_BIN "${gennodejs_DIR}/../../../@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_nodejs.py")
+@[end if]@
+
+# Generate .msg or .srv -> .js
+# The generated .js files should be added ALL_GEN_OUTPUT_FILES_js
+macro(_generate_nodejs ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
+  file(MAKE_DIRECTORY ${ARG_GEN_OUTPUT_DIR})
+
+  #Create input and output filenames
+  get_filename_component(MSG_NAME ${ARG_MSG} NAME)
+  get_filename_component(MSG_SHORT_NAME ${ARG_MSG} NAME_WE)
+
+  set(MSG_GENERATED_NAME ${MSG_SHORT_NAME}.js)
+  set(GEN_OUTPUT_FILE ${ARG_GEN_OUTPUT_DIR}/${MSG_GENERATED_NAME})
+
+  assert(CATKIN_ENV)
+  add_custom_command(OUTPUT ${GEN_OUTPUT_FILE}
+    DEPENDS ${GENNODEJS_BIN} ${ARG_MSG} ${ARG_MSG_DEPS}
+    COMMAND ${CATKIN_ENV} ${PYTHON_EXECUTABLE} ${GENNODEJS_BIN} ${ARG_MSG}
+    ${ARG_IFLAGS}
+    -p ${ARG_PKG}
+    -o ${ARG_GEN_OUTPUT_DIR}
+    COMMENT "Generating Javascript code from ${ARG_PKG}/${MSG_NAME}"
+    )
+
+  list(APPEND ALL_GEN_OUTPUT_FILES_nodejs ${GEN_OUTPUT_FILE})
+
+endmacro()
+
+#gennodejs uses the same program to generate srv and msg files, so call the same macro
+macro(_generate_msg_nodejs ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
+  _generate_nodejs(${ARG_PKG} ${ARG_MSG} "${ARG_IFLAGS}" "${ARG_MSG_DEPS}" "${ARG_GEN_OUTPUT_DIR}/msg")
+endmacro()
+
+#gennodejs uses the same program to generate srv and msg files, so call the same macro
+macro(_generate_srv_nodejs ARG_PKG ARG_SRV ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
+  _generate_nodejs(${ARG_PKG} ${ARG_SRV} "${ARG_IFLAGS}" "${ARG_MSG_DEPS}" "${ARG_GEN_OUTPUT_DIR}/srv")
+endmacro()
+
+macro(_generate_module_nodejs ARG_PKG ARG_GEN_OUTPUT_DIR ARG_GENERATED_FILES)
+endmacro()
+
+set(node_js_INSTALL_DIR share/node_js)
+set(gennodejs_INSTALL_DIR ${node_js_INSTALL_DIR}/ros)

package.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <package>
-  <name>genjs</name>
+  <name>gennodejs</name>
   <version>1.0.0</version>
   <description>
   Javascript ROS message and service generators.

scripts/CMakeLists.txt

@@ -1,3 +1,3 @@
 catkin_install_python(
-  PROGRAMS gen_js.py
+  PROGRAMS gen_nodejs.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})

scripts/gen_js.py → scripts/gen_nodejs.py

@@ -18,8 +18,8 @@
 ##
 ## Converts ROS .msg files in a package into JS source files
 
-import genjs
+import gennodejs
 import sys
 
 if __name__ == "__main__":
-    genjs.genjs_main.genmain(sys.argv, 'gen_js.py')
+    gennodejs.gennodejs_main.genmain(sys.argv, 'gen_nodejs.py')

setup.py

@@ -4,7 +4,7 @@
 from catkin_pkg.python_setup import generate_distutils_setup
 
 d = generate_distutils_setup(
-    packages=['genjs'],
+    packages=['gennodejs'],
     package_dir={'': 'src'},
     requires=['genmsg']
 )

src/genjs/__init__.py → src/gennodejs/__init__.py

@@ -13,4 +13,4 @@
 #    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
-from . genjs_main import *
+from . gennodejs_main import *