diff --git a/Makefile b/Makefile index c5bc6869d9a9d2ce4f91b837cb346e99bc35dd9c..28a35192bcfe9e3d531aa8ceefa973736ab44f18 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,6 @@ SUBDIR+= dynamic-graph-bridge SUBDIR+= dynamic-graph-bridge-msgs SUBDIR+= gdalwrap SUBDIR+= genom3-openprs -SUBDIR+= genom3-ros SUBDIR+= gest-genom SUBDIR+= gladys SUBDIR+= hatpconsole diff --git a/genom3-ros/DESCR b/genom3-ros/DESCR deleted file mode 100644 index a62d905ad894e1df042a5eb51780e2ea23806cd5..0000000000000000000000000000000000000000 --- a/genom3-ros/DESCR +++ /dev/null @@ -1,2 +0,0 @@ -The genom3-ros template (see meta-pkgs/ros-base) provides a GenoM3 -template for generating ros-based components. diff --git a/genom3-ros/Makefile b/genom3-ros/Makefile deleted file mode 100644 index a88274cffd4dff6001407af32d789434e256f4aa..0000000000000000000000000000000000000000 --- a/genom3-ros/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# robotpkg Makefile for: architecture/genom3-ros -# Created: Anthony Mallet on Fri, 19 Oct 2012 -# - -PKGREVISION= 2 -DISTNAME= genom3-ros-1.10 -CATEGORIES= architecture -MASTER_SITES= ${MASTER_SITE_OPENROBOTS:=genom3-ros/} -MASTER_REPOSITORY= ${MASTER_REPOSITORY_OPENROBOTS}genom3/genom3-ros - -MAINTAINER= mallet@laas.fr -HOMEPAGE= http://www.openrobots.org/wiki/genom3 -COMMENT= GenoM3 template for ros-based components - -LICENSE= 2-clause-bsd - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-boost=${PREFIX.boost-headers} - -NOT_FOR_PLATFORM= # empty - -include ../../architecture/genom3/depend.mk -include ../../devel/boost-headers/depend.mk -include ../../devel/ros-ros/depend.mk -include ../../interfaces/ros-common-msgs/depend.mk -include ../../lang/ros-gencpp/depend.mk -include ../../lang/ros-genpy/depend.mk -include ../../middleware/ros-actionlib/depend.mk -include ../../middleware/ros-comm/depend.mk -include ../../pkgtools/pkg-config/depend.mk -include ../../mk/language/c.mk -include ../../mk/language/c++.mk -include ../../mk/robotpkg.mk diff --git a/genom3-ros/PLIST b/genom3-ros/PLIST deleted file mode 100644 index 8fc586f562adb5acaef686b2e5a1dd25f16ee757..0000000000000000000000000000000000000000 --- a/genom3-ros/PLIST +++ /dev/null @@ -1,49 +0,0 @@ -@comment Thu Jul 24 14:35:30 CEST 2014 -bin/rosaction -lib/libros-client.la -lib/pkgconfig/genom3-ros.pc -share/genom/site-templates/ros/client/c/client.Makefile.am -share/genom/site-templates/ros/client/c/client.cc -share/genom/site-templates/ros/client/c/client.configure.ac -share/genom/site-templates/ros/client/c/docutil.tcl -share/genom/site-templates/ros/client/c/info.c -share/genom/site-templates/ros/client/c/init.cc -share/genom/site-templates/ros/client/c/json.cc -share/genom/site-templates/ros/client/c/msglib.cc -share/genom/site-templates/ros/client/c/msglib.h -share/genom/site-templates/ros/client/c/plugin.c -share/genom/site-templates/ros/client/c/portlib.cc -share/genom/site-templates/ros/client/c/private.h -share/genom/site-templates/ros/client/c/template.tcl -share/genom/site-templates/ros/client/ros/client.Makefile.am -share/genom/site-templates/ros/client/ros/client.configure.ac -share/genom/site-templates/ros/client/ros/template.tcl -share/genom/site-templates/ros/common/action.h -share/genom/site-templates/ros/common/autoconf/ax_boost_base.m4 -share/genom/site-templates/ros/common/autoconf/ax_boost_thread.m4 -share/genom/site-templates/ros/common/autoconf/ax_pthread.m4 -share/genom/site-templates/ros/common/genom-serialize.h -share/genom/site-templates/ros/common/genrosmsg.tcl -share/genom/site-templates/ros/common/portlib.h -share/genom/site-templates/ros/common/ros.manifest.xml -share/genom/site-templates/ros/common/serialize.h -share/genom/site-templates/ros/common/service.h -share/genom/site-templates/ros/common/typecopy.h -share/genom/site-templates/ros/server/activities.cc -share/genom/site-templates/ros/server/activities.h -share/genom/site-templates/ros/server/codels.mappings.h -share/genom/site-templates/ros/server/control-codels.cc -share/genom/site-templates/ros/server/control-task.cc -share/genom/site-templates/ros/server/exception.cc -share/genom/site-templates/ros/server/exec-task.cc -share/genom/site-templates/ros/server/internals.h -share/genom/site-templates/ros/server/json.cc -share/genom/site-templates/ros/server/locals.h -share/genom/site-templates/ros/server/main.cc -share/genom/site-templates/ros/server/port.cc -share/genom/site-templates/ros/server/port.h -share/genom/site-templates/ros/server/remote.cc -share/genom/site-templates/ros/server/remote.h -share/genom/site-templates/ros/server/ros.Makefile.am -share/genom/site-templates/ros/server/ros.configure.ac -share/genom/site-templates/ros/server/template.tcl diff --git a/genom3-ros/depend.mk b/genom3-ros/depend.mk deleted file mode 100644 index 8533ecb1507b54051f7c178ed08d21fcc60309f9..0000000000000000000000000000000000000000 --- a/genom3-ros/depend.mk +++ /dev/null @@ -1,26 +0,0 @@ -# robotpkg depend.mk for: architecture/genom3-ros -# Created: Anthony Mallet on Fri, 19 Oct 2012 -# - -DEPEND_DEPTH:= ${DEPEND_DEPTH}+ -GENOM3_ROS_DEPEND_MK:= ${GENOM3_ROS_DEPEND_MK}+ - -ifeq (+,$(DEPEND_DEPTH)) -DEPEND_PKG+= genom3-ros -endif - -ifeq (+,$(GENOM3_ROS_DEPEND_MK)) # ----------------------------------------- - -DEPEND_USE+= genom3-ros -PREFER.genom3-ros?=robotpkg - -SYSTEM_SEARCH.genom3-ros=\ - lib/libros-client.so \ - 'lib/pkgconfig/genom3-ros.pc:/Version/s/[^0-9.]//gp' - -DEPEND_ABI.genom3-ros?= genom3-ros>=1.7 -DEPEND_DIR.genom3-ros?= ../../wip/genom3-ros - -endif # GENOM3_ROS_DEPEND_MK ----------------------------------------------- - -DEPEND_DEPTH:= ${DEPEND_DEPTH:+=} diff --git a/genom3-ros/distinfo b/genom3-ros/distinfo deleted file mode 100644 index d06f2a323b4601a5fecdb4ae0da0bd3806c447c3..0000000000000000000000000000000000000000 --- a/genom3-ros/distinfo +++ /dev/null @@ -1,5 +0,0 @@ -SHA1 (genom3-ros-1.10.tar.gz) = 413014351c46f50d57b4c859d4ff0c3300d1c404 -RMD160 (genom3-ros-1.10.tar.gz) = 0cc9eaf2bfb449d9be9e7657a202af65160c857d -Size (genom3-ros-1.10.tar.gz) = 390003 bytes -SHA1 (patch-aa) = 85cae81cae4dcda2f42c971561498522a3dba456 -SHA1 (patch-ab) = 5caa9bc9ae50408905289c3317fe99c1a7e1cd84 diff --git a/genom3-ros/patches/patch-aa b/genom3-ros/patches/patch-aa deleted file mode 100644 index 010c0ad6a49ab5b2ed76840577415671f182e389..0000000000000000000000000000000000000000 --- a/genom3-ros/patches/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ -From 8c2c0b2061a04a8d2e2dbb279e44a60828ba881a Mon Sep 17 00:00:00 2001 -From: Anthony Mallet <anthony.mallet@laas.fr> -Date: Wed, 6 May 2015 11:14:11 +0200 -Subject: [PATCH] Workaround a strange bug in tcl-8.6.0 - -It looks like using expr { int([$object proc]) } in the context of a genom -template triggers a bug (NULL pointer dereference) when tcl tries to get the -current line number (requested by the genom template parser). - -It happens that using the equvalent tcl::mathfunc::int procedure does not -trigger this issue, so use that instead. ---- - server/control-task.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git server/control-task.cc server/control-task.cc -index 22b36e4..94e057b 100644 ---- server/control-task.cc -+++ server/control-task.cc -@@ -272,9 +272,9 @@ genom_component_data::timercb(const ros::TimerEvent &e) - <' foreach task [$component tasks] {'> - <' if {![catch {$task period} period]} {'> - <' -- set ticks [expr {int([$period value]/[$rate value])}] -+ set ticks [tcl::mathfunc::int [expr {[$period value]/[$rate value]}]] - if {![catch {$task delay} delay]} { -- set d [expr {int([$delay value]/[$rate value])}] -+ set d [tcl::mathfunc::int [expr {[$delay value]/[$rate value]}]] - } else { - set d 0 - } --- -1.9.1 diff --git a/genom3-ros/patches/patch-ab b/genom3-ros/patches/patch-ab deleted file mode 100644 index c1ce2184609ebcbdf0449d021ed5d10594ed6de3..0000000000000000000000000000000000000000 --- a/genom3-ros/patches/patch-ab +++ /dev/null @@ -1,21 +0,0 @@ -diff --git common/serialize.h common/serialize.h -index 3fb95f7..8ab3a6a 100644 ---- common/serialize.h -+++ common/serialize.h -@@ -143,7 +143,7 @@ namespace ros { - <' }'> - <' }'> - <' sequence {'> -- uint32_t i, l; -+ uint32_t l; - stream.next(l); - <' if {[catch {$type length} l]} {'> - if (genom_sequence_reserve(&a, l)) assert(!"out of memory"); -@@ -156,6 +156,7 @@ namespace ros { - memcpy(a._buffer, stream.advance(a._length * sizeof(*a._buffer)), - a._length * sizeof(*a._buffer)); - <' } else {'> -+ uint32_t i; - <"[[$type type] declarator x]">; - for(i = 0; i < a._length; i++) stream.next(a._buffer[i]); - for(; i < l; i++) stream.next(x);