prepend ros- to new ros packages

Makefile

@@ -10,8 +10,8 @@ SUBDIR+=	certi
 SUBDIR+=	cppad
 SUBDIR+=	cppadcodegen
 SUBDIR+=	dptu-genom3
-SUBDIR+=	dynamic-graph-v3
 SUBDIR+=	dynamic-graph-tutorial
+SUBDIR+=	dynamic-graph-v3
 SUBDIR+=	dynamic-introspection
 SUBDIR+=	eigen-quadprog
 SUBDIR+=	example-adder
@@ -25,10 +25,10 @@ SUBDIR+=	histodet
 SUBDIR+=	hpp-environments
 SUBDIR+=	hpp-romeo
 SUBDIR+=	hpp-universal-robot
-SUBDIR+=	hrp2-dev
 SUBDIR+=	hrp2-14-description
 SUBDIR+=	hrp2-bringup
 SUBDIR+=	hrp2-computer-monitor
+SUBDIR+=	hrp2-dev
 SUBDIR+=	hrp2-machine
 SUBDIR+=	infuse-asn1-conversions
 SUBDIR+=	infuse-asn1-types
@@ -51,17 +51,12 @@ SUBDIR+=	morse-mavlink
 SUBDIR+=	morse-ros
 SUBDIR+=	move3d-assets
 SUBDIR+=	move3d-studio
-SUBDIR+=	moveit
-SUBDIR+=	moveit-msgs
-SUBDIR+=	moveit-resources
 SUBDIR+=	msgconnector
 SUBDIR+=	mumps
-SUBDIR+=	object-recognition-msgs
-SUBDIR+=	octomap-msgs
 SUBDIR+=	octovis
 SUBDIR+=	ompl
-SUBDIR+=	openhrp3-simulator-wo-rtm
 SUBDIR+=	openhrp3-hrp2
+SUBDIR+=	openhrp3-simulator-wo-rtm
 SUBDIR+=	orocos-bfl
 SUBDIR+=	orocos-dot_service
 SUBDIR+=	orocos-yarp_transport
@@ -98,30 +93,37 @@ SUBDIR+=	py-sot-dyninv-v3
 SUBDIR+=	py-sot-pattern-generator-v3
 SUBDIR+=	py-sot-tools-v3
 SUBDIR+=	py-sot-torque-control
-SUBDIR+=	py-urdf-parser
 SUBDIR+=	pyrene-motions
 SUBDIR+=	roralink
 SUBDIR+=	roscontrol-sot
+SUBDIR+=	ros-moveit
+SUBDIR+=	ros-moveit-msgs
+SUBDIR+=	ros-moveit-resources
+SUBDIR+=	ros-object-recognition-msgs
+SUBDIR+=	ros-octomap-msgs
+SUBDIR+=	ros-py-urdf-parser
 SUBDIR+=	ros-swri-math-util
 SUBDIR+=	ros-swri-nodelet
 SUBDIR+=	ros-swri-roscpp
 SUBDIR+=	ros-swri-serial-util
 SUBDIR+=	ros-swri-string-util
+SUBDIR+=	ros-universal-robot
+SUBDIR+=	ros-warehouse-ros
 SUBDIR+=	rqt-dynamic-graph
 SUBDIR+=	simple-humanoid-description
 SUBDIR+=	sot-core-v3
 SUBDIR+=	sot-dynamic-pinocchio-v3
 SUBDIR+=	sot-dyninv
 SUBDIR+=	sot-dyninv-v3
+SUBDIR+=	soth
 SUBDIR+=	sot-hrp2
 SUBDIR+=	sot-hrp2-v3
 SUBDIR+=	sot-pattern-generator-v3
 SUBDIR+=	sot-talos
 SUBDIR+=	sot-tools-v3
 SUBDIR+=	sot-torque-control
-SUBDIR+=	soth
-SUBDIR+=	srdfdom
 SUBDIR+=	spark-genom
+SUBDIR+=	srdfdom
 SUBDIR+=	talos-data
 SUBDIR+=	talos-dev
 SUBDIR+=	talos-metapkg-ros-control-sot
@@ -131,9 +133,7 @@ SUBDIR+=	talos-simulation
 SUBDIR+=	tf-lookup
 SUBDIR+=	tiago-robot
 SUBDIR+=	tsid
-SUBDIR+=	universal-robot
 SUBDIR+=	ur5-description
 SUBDIR+=	urg
-SUBDIR+=	warehouse-ros
 
 include ../mk/robotpkg.subdir.mk

hpp-universal-robot/Makefile

@@ -14,7 +14,7 @@ export ROS_PACKAGE_PATH+=	${PREFIX.hpp-universal-robot}/share
 
 include ../../meta-pkgs/hpp/Makefile.common
 
-include ../../wip/universal-robot/depend.mk
+include ../../wip/ros-universal-robot/depend.mk
 include ../../devel/ros-xacro/depend.mk
 
 include ../../mk/sysdep/python.mk

moveit-msgs/Makefile → ros-moveit-msgs/Makefile

-# robotpkg Makefile for:	wip/moveit
+# robotpkg Makefile for:	wip/ros-moveit
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
@@ -12,8 +12,9 @@ CATEGORIES=		wip
 ROS_COMMENT=	ROS messages specific to MoveIt!
 
 include ../../meta-pkgs/ros-base/Makefile.common
-include ../../wip/object-recognition-msgs/depend.mk
-include ../../wip/octomap-msgs/depend.mk
+
+include ../../wip/ros-object-recognition-msgs/depend.mk
+include ../../wip/ros-octomap-msgs/depend.mk
 
 include ../../devel/ros-catkin/depend.mk
 include ../../mk/sysdep/python.mk

moveit-msgs/depend.mk → ros-moveit-msgs/depend.mk

-# robotpkg depend.mk for:	wip/moveit-msgs
+# robotpkg depend.mk for:	wip/ros-moveit-msgs
 # Created:			Guilhem Saurel on Fri, 19 Oct 2018
 #
 
@@ -6,23 +6,23 @@ DEPEND_DEPTH:=		${DEPEND_DEPTH}+
 MOVEIT_MSGS_DEPEND_MK:=	${MOVEIT_MSGS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		moveit-msgs
+DEPEND_PKG+=		ros-moveit-msgs
 endif
 
 ifeq (+,$(MOVEIT_MSGS_DEPEND_MK)) # --------------------------------------
 
-PREFER.moveit-msgs?=	robotpkg
+PREFER.ros-moveit-msgs?=	robotpkg
 
-DEPEND_USE+=		moveit-msgs
+DEPEND_USE+=		ros-moveit-msgs
 
-DEPEND_ABI.moveit-msgs?=	moveit-msgs>=0.10.0
-DEPEND_DIR.moveit-msgs?=	../../wip/moveit-msgs
+DEPEND_ABI.ros-moveit-msgs?=	moveit-msgs>=0.10.0
+DEPEND_DIR.ros-moveit-msgs?=	../../wip/ros-moveit-msgs
 
-SYSTEM_SEARCH.moveit-msgs=\
+SYSTEM_SEARCH.ros-moveit-msgs=\
 	include/moveit_msgs/RobotState.h	\
 	'lib/pkgconfig/moveit_msgs.pc:/Version/s/[^0-9.]//gp'
 
-CMAKE_PREFIX_PATH.moveit-msgs=  ${PREFIX.moveit-msgs}
+CMAKE_PREFIX_PATH.ros-moveit-msgs=  ${PREFIX.ros-moveit-msgs}
 
 endif # MOVEIT_MSGS_DEPEND_MK --------------------------------------------
 

moveit-resources/Makefile → ros-moveit-resources/Makefile

-# robotpkg Makefile for:	wip/moveit
+# robotpkg Makefile for:	wip/ros-moveit
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 

moveit-resources/depend.mk → ros-moveit-resources/depend.mk

-# robotpkg depend.mk for:	wip/moveit-resources
+# robotpkg depend.mk for:	wip/ros-moveit-resources
 # Created:			Guilhem Saurel on Fri, 19 Oct 2018
 #
 
@@ -6,19 +6,19 @@ DEPEND_DEPTH:=		${DEPEND_DEPTH}+
 UNIVERSAL_ROBOT_DEPEND_MK:=	${UNIVERSAL_ROBOT_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		moveit-resources
+DEPEND_PKG+=		ros-moveit-resources
 endif
 
 ifeq (+,$(UNIVERSAL_ROBOT_DEPEND_MK)) # --------------------------------------
 
-PREFER.moveit-resources?=	robotpkg
+PREFER.ros-moveit-resources?=	robotpkg
 
-DEPEND_USE+=		moveit-resources
+DEPEND_USE+=		ros-moveit-resources
 
-DEPEND_ABI.moveit-resources?=	moveit-resources>=0.6.4
-DEPEND_DIR.moveit-resources?=	../../wip/moveit-resources
+DEPEND_ABI.ros-moveit-resources?=	moveit-resources>=0.6.4
+DEPEND_DIR.ros-moveit-resources?=	../../wip/ros-moveit-resources
 
-SYSTEM_SEARCH.moveit-resources=\
+SYSTEM_SEARCH.ros-moveit-resources=\
 	include/moveit_resources/config.h	\
 	'lib/pkgconfig/moveit_resources.pc:/Version/s/[^0-9.]//gp'
 

moveit/Makefile → ros-moveit/Makefile

-# robotpkg Makefile for:	wip/moveit
+# robotpkg Makefile for:	wip/ros-moveit
 # Created:			Guilhem Saurel on Wed, 19 Dec 2018
 #
 
@@ -15,11 +15,12 @@ ROS_COMMENT=	The MoveIt! Motion Planning Framework
 
 include ../../meta-pkgs/ros-base/Makefile.common
 
-include ../../wip/moveit-resources/depend.mk
-include ../../wip/moveit-msgs/depend.mk
-include ../../wip/srdfdom/depend.mk
+include ../../wip/ros-moveit-resources/depend.mk
+include ../../wip/ros-moveit-msgs/depend.mk
+include ../../wip/ros-srdfdom/depend.mk
 include ../../wip/ompl/depend.mk
-include ../../wip/warehouse-ros/depend.mk
+include ../../wip/ros-warehouse-ros/depend.mk
+
 include ../../image/ros-image-common/depend.mk
 include ../../interfaces/ros-control-msgs/depend.mk
 #include ../../mapping/octomap/depend.mk

moveit/depend.mk → ros-moveit/depend.mk

-# robotpkg depend.mk for:	wip/moveit
+# robotpkg depend.mk for:	wip/ros-moveit
 # Created:			Guilhem Saurel on Fri, 19 Oct 2018
 #
 
@@ -6,23 +6,23 @@ DEPEND_DEPTH:=		${DEPEND_DEPTH}+
 MOVEIT_DEPEND_MK:=	${MOVEIT_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		moveit
+DEPEND_PKG+=		ros-moveit
 endif
 
 ifeq (+,$(MOVEIT_DEPEND_MK)) # --------------------------------------
 
-PREFER.moveit?=	robotpkg
+PREFER.ros-moveit?=	robotpkg
 
-DEPEND_USE+=		moveit
+DEPEND_USE+=		ros-moveit
 
-DEPEND_ABI.moveit?=	moveit>=0.10.5
-DEPEND_DIR.moveit?=	../../wip/moveit
+DEPEND_ABI.ros-moveit?=	moveit>=0.10.5
+DEPEND_DIR.ros-moveit?=	../../wip/ros-moveit
 
-SYSTEM_SEARCH.moveit=\
+SYSTEM_SEARCH.ros-moveit=\
 	include/moveit/backtrace/backtrace.h	\
 	'lib/pkgconfig/moveit_core.pc:/Version/s/[^0-9.]//gp'
 
-CMAKE_PREFIX_PATH.moveit=   ${PREFIX.moveit}
+CMAKE_PREFIX_PATH.ros-moveit=   ${PREFIX.ros-moveit}
 
 endif # MOVEIT_DEPEND_MK --------------------------------------------