Skip to content
Snippets Groups Projects
Commit 1a402ff4 authored by Anthony Mallet's avatar Anthony Mallet
Browse files

[wip/genom3-ros] Update to 1.7

Changes since 1.6:
 . Fix the generation of serialization methods in presence of 'native' types
 . Fix a typo in the client/c pkgconfig file (wrong middleware name)
 . Install client/c headers and libraries in a middleware-specific location
 . Fix serialization for arrays of structured types
 . Fix ROS_PACKAGE_PATH setting
 . Properly quote exception detail when reporting a JSON unknown exception
 . Fix deserialization of void exceptions in the C client
parent ad911d77
No related branches found
No related tags found
No related merge requests found
...@@ -2,14 +2,13 @@ ...@@ -2,14 +2,13 @@
# Created: Anthony Mallet on Fri, 19 Oct 2012 # Created: Anthony Mallet on Fri, 19 Oct 2012
# #
PKGREVISION= 1 DISTNAME= genom3-ros-1.7
DISTNAME= genom3-ros-1.6
CATEGORIES= architecture CATEGORIES= architecture
MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=genom3-ros/} MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=genom3-ros/}
MASTER_REPOSITORY= git git://git.openrobots.org/git/robots/genom3-ros MASTER_REPOSITORY= git git://git.openrobots.org/git/robots/genom3-ros
MAINTAINER= mallet@laas.fr MAINTAINER= mallet@laas.fr
HOMEPAGE= https://homepages.laas.fr/mallet/soft/architecture/genom3 HOMEPAGE= http://www.openrobots.org/wiki/genom3
COMMENT= GenoM3 template for ros-based components COMMENT= GenoM3 template for ros-based components
LICENSE= 2-clause-bsd LICENSE= 2-clause-bsd
......
...@@ -18,7 +18,7 @@ SYSTEM_SEARCH.genom3-ros=\ ...@@ -18,7 +18,7 @@ SYSTEM_SEARCH.genom3-ros=\
lib/libros-client.so \ lib/libros-client.so \
'lib/pkgconfig/genom3-ros.pc:/Version/s/[^0-9.]//gp' 'lib/pkgconfig/genom3-ros.pc:/Version/s/[^0-9.]//gp'
DEPEND_ABI.genom3-ros?= genom3-ros>=1.5 DEPEND_ABI.genom3-ros?= genom3-ros>=1.7
DEPEND_DIR.genom3-ros?= ../../wip/genom3-ros DEPEND_DIR.genom3-ros?= ../../wip/genom3-ros
endif # GENOM3_ROS_DEPEND_MK ----------------------------------------------- endif # GENOM3_ROS_DEPEND_MK -----------------------------------------------
......
SHA1 (genom3-ros-1.6.tar.gz) = 2abea76ad4f4d6ba404e57404b0673e4607d7072 SHA1 (genom3-ros-1.7.tar.gz) = b388b072bc40c8d82f394c5fe7511070d842aa91
RMD160 (genom3-ros-1.6.tar.gz) = 6565f0cf1012dbd21cf4d1e99c761b90ad2508c3 RMD160 (genom3-ros-1.7.tar.gz) = 678fe7284ecd8d447e4efc283263b52c1595c025
Size (genom3-ros-1.6.tar.gz) = 382973 bytes Size (genom3-ros-1.7.tar.gz) = 382979 bytes
SHA1 (patch-aa) = afb6f39ec34999a3f1f40d5495bad26621c6b5c7
diff --git server/template.tcl server/template.tcl
index 695ae41..ebc514d 100644
--- server/template.tcl
+++ server/template.tcl
@@ -106,15 +106,6 @@ template require ../common/genrosmsg.tcl
set msg_types [genrossrv $comp true]
set msg_types [genrosmsg $msg_types]
-# get the list of private types (interface + ids)
-set types [dict create]
-foreach c [dotgen components] {
- foreach t [$c types private] {
- dict set types [$t mangle] $t
- }
-}
-set types [dict values $types]
-
# public exception list + remote
set exl [dict create]
foreach t [$comp throws] {
@@ -132,7 +123,7 @@ foreach r [$comp remotes] {
set exl [dict values $exl]
# generate type manipulation for all private types
-template parse args [list $types] \
+template parse args [list [$comp types private]] \
string $header file ../common/typecopy.h \
file src/[$comp name]_typecopy.h
template parse args [list $exl] \
@@ -140,7 +131,7 @@ template parse args [list $exl] \
# generate serialization for all public types
template parse file ../common/genom-serialize.h file src/genom-serialize.h
-template parse args [list $types] \
+template parse args [list [$comp types extern]] \
string $header file ../common/serialize.h file src/[$comp name]_serialize.h
template parse file ../common/portlib.h file src/[$comp name]_portlib.h
template parse args [list [concat [$comp services] [$comp remotes]]] \
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment