Merge pull request #154 from bulwahn/pull-request-144

Rebased work from pull request #144 to current master

classes/catkin.bbclass

@@ -2,7 +2,7 @@
 # Copyright (c) 2013 Stefan Herbrechtsmeier, Bielefeld University
 # 
 
-inherit cmake distutils-base
+inherit cmake distutils-base ros
 
 DEPENDS_prepend = "${@['catkin-native ', ''][d.getVar('BPN', True) == 'catkin']}"
 
@@ -28,33 +28,6 @@ OECMAKE_BUILDPATH = "${S}/build"
 export BUILD_SYS
 export HOST_SYS
 
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
-
-ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}"
-ROS_BP = "${ROS_BPN}-${PV}"
-
-FILES_${PN} += "\
-    ${prefix}/etc \
-    ${datadir}/ros/config/${ROS_BPN}.config \
-    ${datadir}/${ROS_BPN} \
-    "
-
-FILES_${PN}-dev += "\
-    ${datadir}/${ROS_BPN}/cmake \
-    ${datadir}/${ROS_BPN}/*.template \
-    "
-
-FILES_${PN}-dbg += "\
-    ${libdir}/${ROS_BPN}/.debug/* \
-    "
-
-PACKAGES += "${PN}-commonlisp"
-
-FILES_${PN}-commonlisp += " \
-    ${datadir}/common-lisp/ \
-    "
-
 SYSROOT_PREPROCESS_FUNCS += "catkin_sysroot_preprocess"
 
 catkin_sysroot_preprocess () {

classes/ros.bbclass

+#
+# Copyright (c) 2013 Stefan Herbrechtsmeier, Bielefeld University
+# 
+
+ROS_BPN = "${@d.getVar('BPN', True).replace('-', '_')}"
+
+ROS_SPN ?= "${ROS_BPN}"
+ROS_SP = "${ROS_SPN}-${PV}"
+
+FILES_SOLIBSDEV = ""
+FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
+
+FILES_${PN} += "\
+    ${prefix}/etc \
+    ${datadir}/ros/config/${ROS_BPN}.config \
+    ${datadir}/ros/core/${ROS_BPN} \
+    ${datadir}/${ROS_BPN} \
+    "
+
+FILES_${PN}-dev += "\
+    ${datadir}/${ROS_BPN}/cmake \
+    ${datadir}/${ROS_BPN}/*.template \
+    "
+
+FILES_${PN}-dbg += "\
+    ${libdir}/${ROS_BPN}/.debug/* \
+    "
+
+PACKAGES += "${PN}-commonlisp"
+
+FILES_${PN}-commonlisp += " \
+    ${datadir}/common-lisp/ \
+    "

recipes-ros/actionlib/actionlib/0001-check-for-CATKIN_ENABLE_TESTING.patch

+From f066ff531ecdea3b859881aa1f4b4b34cba910c1 Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dthomas@osrfoundation.org>
+Date: Wed, 3 Jul 2013 11:30:06 -0700
+Subject: [PATCH] check for CATKIN_ENABLE_TESTING
+
+---
+ CMakeLists.txt | 4 +++-
+ package.xml    | 2 +-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8a51426..20421f1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,4 +32,6 @@ install(DIRECTORY include/${PROJECT_NAME}/
+   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
+   FILES_MATCHING PATTERN "*.h")
+ 
+-add_subdirectory(test)
++if(CATKIN_ENABLE_TESTING)
++  add_subdirectory(test)
++endif()
+diff --git a/package.xml b/package.xml
+index 4d692ee..e45d984 100644
+--- a/package.xml
++++ b/package.xml
+@@ -14,7 +14,7 @@
+   <author>Eitan Marder-Eppstein</author>
+   <author>Vijay Pradeep</author>
+ 
+-  <buildtool_depend>catkin</buildtool_depend>
++  <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+ 
+   <build_depend>actionlib_msgs</build_depend>
+   <build_depend>boost</build_depend>
+-- 
+1.8.1.6
+

recipes-ros/actionlib/actionlib_1.10.1.bb

@@ -4,14 +4,12 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros/${BPN}/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz;name=archive"
-SRC_URI[archive.md5sum] = "8da88314483b1330906b0ecf89c33494"
-SRC_URI[archive.sha256sum] = "c76317f60afec9e4cdcce28e0b88b9aef7e355ba8295228e759aa914ed10aae4"
+DEPENDS = "actionlib-msgs roscpp rostest"
 
-SRC_URI += "https://github.com/ros/actionlib/commit/f066ff531ecdea3b859881aa1f4b4b34cba910c1.patch;name=patch"
-SRC_URI[patch.md5sum] = "ba32239ddb0c6837a4296119dda5f08a"
-SRC_URI[patch.sha256sum] = "d07e4cd0982fee417f574acac4e2e2a0387188bf254c6f49f7ab0f8c206082b8"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "8da88314483b1330906b0ecf89c33494"
+SRC_URI[sha256sum] = "c76317f60afec9e4cdcce28e0b88b9aef7e355ba8295228e759aa914ed10aae4"
 
-DEPENDS = "actionlib-msgs roscpp rostest"
+SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
 
 inherit catkin

recipes-ros/bond-core/bond-core.inc

-SRC_URI = "https://github.com/ros/bond_core/archive/${PV}.tar.gz;downloadfilename=bond_core-${PV}.tar.gz"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "1bb6c5dd1148c67d2759e665d7ae75b3"
 SRC_URI[sha256sum] = "1145db3800591e585325131cb6322366e82e634c97dd3cbb4ab43e1c1f4ec415"
 
-S = "${WORKDIR}/bond_core-${PV}/${PN}"
+S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
 inherit catkin
+
+ROS_SPN = "bond_core"

recipes-ros/catkin/catkin_0.5.71.bb

@@ -3,19 +3,17 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-DEPENDS = "cmake python-empy python-catkin-pkg python-empy-native python-catkin-pkg-native"
+PR = "r1"
 
-RDEPENDS_${PN}_class-native = ""
-RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \
-    python-catkin-pkg python-argparse python-misc python-multiprocessing \
-    python-shell python-subprocess python-xml"
+DEPENDS = "cmake python-empy python-catkin-pkg python-empy-native python-catkin-pkg-native"
 
-SRC_URI = "https://github.com/ros/catkin/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz \
-           file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch \
-           "
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "1c30ac4fcc82ce2aedf610ea972ab4d2"
 SRC_URI[sha256sum] = "2494dbe3446fe94a55f57c74260e072f97d72944d89610fe4994dbc79cf1a561"
 
+SRC_URI += "file://0001-modify-logic-of-sourcing-env-hooks-to-provide-contex.patch"
+SRC_URI += "file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch"
+
 inherit catkin
 
 FILES_${PN}-dev += "\
@@ -27,3 +25,8 @@ FILES_${PN}-dev += "\
     ${prefix}/env.sh \
     ${prefix}/setup.* \
     "
+
+RDEPENDS_${PN}_class-native = ""
+RDEPENDS_${PN} = "cmake make binutils binutils-symlinks gcc gcc-symlinks g++ g++-symlinks \
+    python-catkin-pkg python-argparse python-misc python-multiprocessing \
+    python-shell python-subprocess python-xml"

recipes-ros/class-loader/class-loader_0.2.2.bb

@@ -6,17 +6,16 @@ runtime libraries (e.g. .so/.dll files), introspect the library for exported \
 plugin classes, and allows users to instantiate objects of said exported \
 classes without the explicit declaration (i.e. header file) for those classes.\
 "
-
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz"
+DEPENDS = "console-bridge libpoco"
+
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "c3bbc15c580dbf3b814b8af84218a777"
 SRC_URI[sha256sum] = "afaa155be9e34d905396c96eac040007e23b4ba90d2b2677ab67a1b32086fe13"
 
-DEPENDS = "console-bridge libpoco"
-
-S = "${WORKDIR}/${ROS_BP}"
+S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin

recipes-ros/common-msgs/common-msgs.inc

-SRC_URI = "https://github.com/ros/common_msgs/archive/${PV}.tar.gz;downloadfilename=common_msgs-${PV}.tar.gz"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "6259ec362103ed96abbcf7d67703aed5"
 SRC_URI[sha256sum] = "54864270e973cec64f9315aed9e07f8d3837c409602dd18653c843c7a35690d0"
 
-inherit catkin
+DEPENDS += "cpp-common roscpp-serialization message-generation-native message-runtime-native std-msgs"
+
+S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
-S = "${WORKDIR}/common_msgs-${PV}/${ROS_BPN}"
+inherit catkin
 
-DEPENDS = "cpp-common roscpp-serialization message-generation-native message-runtime-native std-msgs"
+ROS_SPN = "common_msgs"

recipes-ros/common-msgs/nav-msgs_1.10.0.bb

@@ -3,6 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "actionlib-msgs geometry-msgs"
 
-DEPENDS += "actionlib-msgs geometry-msgs"
+require common-msgs.inc

recipes-ros/common-msgs/sensor-msgs_1.10.0.bb

@@ -4,6 +4,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "geometry-msgs"
 
-DEPENDS += "geometry-msgs"
+require common-msgs.inc

recipes-ros/common-msgs/shape-msgs_1.10.0.bb

@@ -3,6 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "geometry-msgs"
 
-DEPENDS += "geometry-msgs"
+require common-msgs.inc

recipes-ros/common-msgs/stereo-msgs_1.10.0.bb

@@ -4,6 +4,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "sensor-msgs"
 
-DEPENDS += "sensor-msgs"
+require common-msgs.inc

recipes-ros/common-msgs/trajectory-msgs_1.10.0.bb

@@ -3,6 +3,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "geometry-msgs"
 
-DEPENDS += "geometry-msgs"
+require common-msgs.inc

recipes-ros/common-msgs/visualization-msgs_1.10.0.bb

@@ -4,6 +4,6 @@ SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
 
-require common-msgs.inc
+DEPENDS = "geometry-msgs"
 
-DEPENDS += "geometry-msgs"
+require common-msgs.inc

recipes-ros/common-tutorials/common-tutorials.inc

-SRC_URI = "https://github.com/ros/common_tutorials/archive/${PV}.tar.gz;downloadfilename=common_tutorials-${PV}.tar.gz"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "0055265f3854afcf4cc0abff06a9f023"
 SRC_URI[sha256sum] = "257f45f36463d5ffc04e1d60ac1fc6a2e7c1b11d012daa43b2eb43001383048c"
 
-S = "${WORKDIR}/common_tutorials-${PV}/${ROS_BPN}"
+S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
 
 inherit catkin
+
+ROS_SPN = "common_tutorials"

recipes-ros/console-bridge/console-bridge_0.2.4.bb

@@ -3,9 +3,7 @@ console_bridge is a ROS-independent, pure CMake package that provides logging \
 calls that mirror those found in rosconsole, but for applications that are \
 not necessarily using ROS.\
 "
-
 SECTION = "devel"
-
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "\
   file://include/console_bridge/console.h;beginline=1;endline=33;md5=279eed49072cc9f6ebe38974afcc4803 \
@@ -14,13 +12,10 @@ LIC_FILES_CHKSUM = "\
 
 DEPENDS = "boost"
 
-SRC_URI = "https://github.com/ros/console_bridge/archive/${PV}.tar.gz;downloadfilename=${BP}.tar.gz"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
 SRC_URI[md5sum] = "e484d34bf0170ee12311d0fc6dd5f4fe"
 SRC_URI[sha256sum] = "d4bdd0b6bce0c6fa9ff18b8926d4953161451bc49dd11497211eb1a62cfe72b7"
 
-S = "${WORKDIR}/console_bridge-${PV}"
-
-inherit cmake
+S = "${WORKDIR}/${ROS_SP}"
 
-FILES_SOLIBSDEV = ""
-FILES_${PN} += "${libdir}/lib*${SOLIBSDEV}"
+inherit cmake ros

recipes-ros/dynamic-reconfigure/dynamic-reconfigure/0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch

+From b7b222534f7259ca457ea354d92c5708f895202e Mon Sep 17 00:00:00 2001
+From: Dirk Thomas <dthomas@osrfoundation.org>
+Date: Mon, 29 Jul 2013 11:51:23 -0700
+Subject: [PATCH] resolve dynamic_reconfigure path in installspace at runtime
+ (ros/catkin#490)
+
+---
+ cmake/extras.cmake.em | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/extras.cmake.em b/cmake/extras.cmake.em
+index de2082e..e37b1fa 100644
+--- a/cmake/extras.cmake.em
++++ b/cmake/extras.cmake.em
+@@ -3,7 +3,7 @@
+ set(dynamic_reconfigure_BASE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)")
+ @[else]@
+ # base dir in installspace
+-set(dynamic_reconfigure_BASE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
++set(dynamic_reconfigure_BASE_DIR "${dynamic_reconfigure_DIR}/..")
+ @[end if]@
+ 
+ macro(generate_dynamic_reconfigure_options)
+-- 
+1.8.1.6
+

recipes-ros/dynamic-reconfigure/dynamic-reconfigure_1.5.32.bb

 DESCRIPTION = "\
 This unary stack contains the dynamic_reconfigure package which provides a means to change \
 node parameters at any time without having to restart the node."
-
 SECTION = "devel"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=5ee5b8b046ae48ad94a2037ca953a67b"
 
-SRC_URI = "https://github.com/ros/${ROS_BPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_BP}.tar.gz;name=archive"
-SRC_URI[archive.md5sum] = "9061fd30e5a04e8376eaddffaae86b07"
-SRC_URI[archive.sha256sum] = "4203b0a8389d9ac3203110b507d23fa353262cf26253f40abece6418d6c2bdd4"
+SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
+SRC_URI[md5sum] = "9061fd30e5a04e8376eaddffaae86b07"
+SRC_URI[sha256sum] = "4203b0a8389d9ac3203110b507d23fa353262cf26253f40abece6418d6c2bdd4"
 
-SRC_URI += "https://github.com/ros/dynamic_reconfigure/commit/b7b222534f7259ca457ea354d92c5708f895202e.patch;name=patch"
-SRC_URI[patch.md5sum] = "0607963ca3f940362c9e78b5f8019cb9"
-SRC_URI[patch.sha256sum] = "e132ed52fe35c287658700857f7d9439793ff2be7f9fa9a19731024152ccaf29"
+SRC_URI += "file://0001-resolve-dynamic_reconfigure-path-in-installspace-at-.patch"
 
 DEPENDS = "roscpp std-msgs roslib"
-RDEPENDS_${PN} = "roslib"
 
-S = "${WORKDIR}/${ROS_BP}"
+S = "${WORKDIR}/${ROS_SP}"
 
 inherit catkin
+
+RDEPENDS_${PN} = "roslib"

recipes-ros/gencpp/gencpp/0001-gencpp-extras.cmake.em-Use-find_program-for-GENCPP_B.patch

-From 4e51c828b27eb1d67a3199c692aac1783f853493 Mon Sep 17 00:00:00 2001
-From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
-Date: Fri, 12 Jul 2013 09:59:13 +0200
-Subject: [PATCH] gencpp-extras.cmake.em: Use find_program for GENCPP_BIN
-
-This patch was originally created by
-Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>.
-I only adjusted it to the current version.
-
-Signed-off-by: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
----
- cmake/gencpp-extras.cmake.em |   10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/gencpp-extras.cmake.em b/cmake/gencpp-extras.cmake.em
-index 87f46fd..4fc5284 100644
---- a/cmake/gencpp-extras.cmake.em
-+++ b/cmake/gencpp-extras.cmake.em
-@@ -1,13 +1,17 @@
- @[if DEVELSPACE]@
- # bin and template dir variables in develspace
--set(GENCPP_BIN "@(CMAKE_CURRENT_SOURCE_DIR)/scripts/gen_cpp.py")
-+set(GENCPP_BIN_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
- set(GENCPP_TEMPLATE_DIR "@(CMAKE_CURRENT_SOURCE_DIR)/scripts")
-+set(CATKIN_FIND_ROOT_PATH_MODE NO_CMAKE_FIND_ROOT_PATH)
- @[else]@
- # bin and template dir variables in installspace
--set(GENCPP_BIN "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)/gen_cpp.py")
--set(GENCPP_TEMPLATE_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)")
-+set(GENCPP_BIN_DIR "@(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_BIN_DESTINATION)")
-+set(GENCPP_TEMPLATE_DIR "${CMAKE_CURRENT_LIST_DIR}/..")
-+set(CATKIN_FIND_ROOT_PATH_MODE "")
- @[end if]@
- 
-+find_program(GENCPP_BIN gen_cpp.py PATHS ${GENCPP_BIN_DIR} NO_DEFAULT_PATH ${CATKIN_FIND_ROOT_PATH_MODE})
-+
- # Generate .msg->.h for cpp
- # The generated .h files should be added ALL_GEN_OUTPUT_FILES_cpp
- macro(_generate_msg_cpp ARG_PKG ARG_MSG ARG_IFLAGS ARG_MSG_DEPS ARG_GEN_OUTPUT_DIR)
--- 
-1.7.9.5
-