Skip to content

Commit 4741df5

Browse files
chris-smithIanTheEngineer
authored andcommitted
Bundled updates (#12)
* Update Bundle * Optionally accept object when constructing messages * Add md5sum for Service * Updates to generated code to use pre-allocated buffers * Generated code relies on external npm package for base serialization, deserialization, finding other message packages * Handle ros_msg_utils npm package rename * Incorrect argument, push array serialization to ros_msg_utils * Remove unused get message fixed size method * Updates to sync with indigo-devel * Fix compilation, update version in package.xml
1 parent d062afd commit 4741df5

7 files changed

Lines changed: 301 additions & 475 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,6 @@ file(WRITE ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/gennodejs "JAVASCR
1313
install(FILES ${CATKIN_DEVEL_PREFIX}/${GENMSG_LANGS_DESTINATION}/gennodejs
1414
DESTINATION ${GENMSG_LANGS_DESTINATION})
1515

16-
# install base serialization, deserialization files
17-
set(base_files
18-
src/gennodejs/base_serialize.js
19-
src/gennodejs/base_deserialize.js
20-
src/gennodejs/find.js)
21-
22-
install(FILES ${base_files}
23-
DESTINATION ${CATKIN_GLOBAL_SHARE_DESTINATION}/gennodejs)
24-
2516
# drop marker file to prevent rospack from spending time on crawling this folder
2617
#file(WRITE ${CATKIN_DEVEL_PREFIX}/share/nodejs/rospack_nosubdirs "")
2718
#install(FILES ${CATKIN_DEVEL_PREFIX}/share/nodejs/rospack_nosubdirs

cmake/gennodejs-extras.cmake.em

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ macro(_generate_srv_nodejs ARG_PKG ARG_SRV ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPU
4545
endmacro()
4646

4747
macro(_generate_module_nodejs ARG_PKG ARG_GEN_OUTPUT_DIR ARG_GENERATED_FILES)
48-
set(base_files
49-
"${JS_FILES_DIR}/base_serialize.js"
50-
"${JS_FILES_DIR}/base_deserialize.js"
51-
"${JS_FILES_DIR}/find.js")
52-
53-
file(COPY ${base_files} DESTINATION ${ARG_GEN_OUTPUT_DIR})
5448
endmacro()
5549

5650
set(node_js_INSTALL_DIR share/gennodejs)

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package>
33
<name>gennodejs</name>
4-
<version>1.0.3</version>
4+
<version>2.0.0</version>
55
<description>
66
Javascript ROS message and service generators.
77
</description>

src/gennodejs/base_deserialize.js

Lines changed: 0 additions & 164 deletions
This file was deleted.

src/gennodejs/base_serialize.js

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)