From bb22a82aaaa52fa21f006dc5bcdd61a9a19430f5 Mon Sep 17 00:00:00 2001
From: Anthony Mallet <anthony.mallet@laas.fr>
Date: Wed, 4 Dec 2013 15:18:09 +0100
Subject: [PATCH] [wip/ros-realtime-tools] Fix some glitches
- Wrap long lines in DESCR
- Fix HOMEPAGE (actually drop it, since the default in
meta-pkgs/ros-base/Makefile.common is fine).
- Shorten ROS_COMMENT to ~60 chars
- Drop useless dependency on tinyxml
- Fix typos in depend.mk
- Add a ros>=hydro requirement in the Makefile, since this package is not
available in groovy. This is currently a show stopper, because robotpkg
supports only groovy with PREFER.ros=robotpkg, so this package cannot build
ATM.
---
ros-realtime-tools/DESCR | 5 ++++-
ros-realtime-tools/Makefile | 7 ++-----
ros-realtime-tools/depend.mk | 10 +++-------
3 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/ros-realtime-tools/DESCR b/ros-realtime-tools/DESCR
index 1434f2b7..160bee97 100755
--- a/ros-realtime-tools/DESCR
+++ b/ros-realtime-tools/DESCR
@@ -1 +1,4 @@
-This package contains a set of tools that can be used from a hard realtime thread, without breaking the realtime behavior. The tools currently only provides the realtime publisher, which makes it possible to publish messages to a ROS topic from a realtime thread.
\ No newline at end of file
+This package contains a set of tools that can be used from a hard realtime
+thread, without breaking the realtime behavior. The tools currently only
+provides the realtime publisher, which makes it possible to publish messages to
+a ROS topic from a realtime thread.
diff --git a/ros-realtime-tools/Makefile b/ros-realtime-tools/Makefile
index 40084853..541f63e6 100755
--- a/ros-realtime-tools/Makefile
+++ b/ros-realtime-tools/Makefile
@@ -7,15 +7,12 @@ ROS_VERSION= 1.8.2
ROS_REPO= ros-controls
CATEGORIES= devel
-ROS_COMMENT= provides a realtime publisher, which makes it possible to publish messages to a ROS topic from a reatime thread
-HOMEPAGE= wiki.ros.org/realtime_tools
+ROS_COMMENT= topic publisher from reatime threads
include ../../meta-pkgs/ros-base/Makefile.common
-CMAKE_ARGS+= -DTINYXML_ROOT=${PREFIX.tinyxml}
+DEPEND_ABI.ros+=ros>=hydro
include ../../devel/ros-catkin/depend.mk
include ../../middleware/ros-comm/depend.mk
-include ../../mk/sysdep/tinyxml.mk
include ../../mk/robotpkg.mk
-
diff --git a/ros-realtime-tools/depend.mk b/ros-realtime-tools/depend.mk
index 555d81b2..55a0991d 100755
--- a/ros-realtime-tools/depend.mk
+++ b/ros-realtime-tools/depend.mk
@@ -9,7 +9,7 @@ ifeq (+,$(DEPEND_DEPTH))
DEPEND_PKG+= ros-realtime-tools
endif
-ifeq (+,$(ROS_REALTIMETOOLS_DEPEND_MK)) # --------------------------------------
+ifeq (+,$(ROS_REALTIMETOOLS_DEPEND_MK)) # ----------------------------------
include ../../meta-pkgs/ros-base/depend.common
PREFER.ros-reatime-tools?= ${PREFER.ros-base}
@@ -18,18 +18,14 @@ SYSTEM_PREFIX.ros-realtime-tools?= ${SYSTEM_PREFIX.ros-base}
DEPEND_USE+= ros-realtime-tools
ROS_DEPEND_USE+= ros-realtime-tools
-DEPEND_ABI.ros+= ros>=hydro
-
DEPEND_ABI.ros-realtime-tools?= ros-realtime-tools>=1.8.2
-DEPEND_DIR.ros-realtime-tools?= ../../devel/ros-reatime-tools
-
-DEPEND_ABI.ros-reatime-tools.hydro?= ros-realtime-tools>=1.8.2
+DEPEND_DIR.ros-realtime-tools?= ../../wip/ros-realtime-tools
SYSTEM_SEARCH.ros-realtime-tools=\
'include/realtime_tools/realtime_box.h' \
'share/realtime_tools/${ROS_STACKAGE}:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/realtime_tools.pc:/Version/s/[^0-9.]//gp'
-endif # ROS_REALTIMETOOLS_DEPEND_MK --------------------------------------------
+endif # ROS_REALTIMETOOLS_DEPEND_MK ----------------------------------------
DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
--
GitLab