Merge pull request #274 from bulwahn/master-next

Updates till late June 2014
This commit is contained in:
KristofRobot 2014-06-25 16:33:14 +02:00
commit 3954c3960a
81 changed files with 44 additions and 90 deletions

View File

@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "cmake python-empy python-catkin-pkg python-empy-native python-catkin-pkg-native"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "fa8af05872962d3b0df9492df5fd63af"
SRC_URI[sha256sum] = "a6e26e1285c881fbf51ddb67a76a59302d2e78cfd6d380b99908110f2411f1df"
SRC_URI[md5sum] = "472ff1f0e04f456af65fa16060fc75c6"
SRC_URI[sha256sum] = "e393e114f491d54982d854ba6e878fd85ed9606d6a5cc122d30fd950daed269f"
SRC_URI += "file://0001-CATKIN_WORKSPACES-Don-t-require-.catkin-file.patch"

View File

@ -1,46 +0,0 @@
From f953151cce932ffa8e0d14fc12b512d8e7d448fe Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Wed, 22 Jan 2014 11:18:25 +0100
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
Upstream-Status: Accepted
---
CMakeLists.txt | 8 +++++---
package.xml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdf4a9f..a76b054 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,9 +30,11 @@ target_link_libraries(DepthImageToLaserScanNodelet DepthImageToLaserScanROS ${ca
add_executable(depthimage_to_laserscan src/depthimage_to_laserscan.cpp)
target_link_libraries(depthimage_to_laserscan DepthImageToLaserScanROS ${catkin_LIBRARIES})
-# Test the library
-catkin_add_gtest(libtest test/DepthImageToLaserScanTest.cpp)
-target_link_libraries(libtest DepthImageToLaserScan ${catkin_LIBRARIES})
+if(CATKIN_ENABLE_TESTING)
+ # Test the library
+ catkin_add_gtest(libtest test/DepthImageToLaserScanTest.cpp)
+ target_link_libraries(libtest DepthImageToLaserScan ${catkin_LIBRARIES})
+endif()
# add the test executable, keep it from being built by "make all"
add_executable(test_dtl EXCLUDE_FROM_ALL test/depthimage_to_laserscan_rostest.cpp)
diff --git a/package.xml b/package.xml
index 86f182a..d5ecc06 100644
--- a/package.xml
+++ b/package.xml
@@ -12,7 +12,7 @@
<author>Chad Rockey</author>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>roscpp</build_depend>
<build_depend>gtest</build_depend>
--
1.8.5.1

View File

@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "roscpp sensor-msgs nodelet image-transport image-geometry dynamic-reconfigure"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "ae007125db0a6586c176e0b111ae62c1"
SRC_URI[sha256sum] = "ae5ee31fc7cb9cd35dd3dd1b36ae00f084f874131d474466791bdb050cd7340f"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch"
SRC_URI[md5sum] = "b8fb5b855be4f7a8d22377d5d866bb47"
SRC_URI[sha256sum] = "3aa236f81cfd26e55718edfb50ef837a59b57169cb20a5b24f9a4e99602a09e8"
S = "${WORKDIR}/${ROS_SP}"

View File

@ -6,8 +6,8 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "a6df76bcd6da3130043c792ff90f6a80"
SRC_URI[sha256sum] = "d27b6be763be88ec2a0eab946a9d55b1074ec4bcddb0da6d6ed90b81541487bd"
SRC_URI[md5sum] = "38248b33c5c8bc6d97d8f9e3ae349016"
SRC_URI[sha256sum] = "5f2c978861d6273af9fc40ff53b457d15b871ea7276278dcbd3eb9ba70044da3"
DEPENDS = "roscpp std-msgs roslib"

View File

@ -1,12 +0,0 @@
DESCRIPTION = "Common-Lisp ROS message and service generators."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "genmsg"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "58b049b28c98c6e3456dd5b422c1d1f9"
SRC_URI[sha256sum] = "b40b6c2df3e70e540ed5b27657a3b772268525a1c7819b87e145f637fd5d4d44"
inherit catkin

View File

@ -0,0 +1,12 @@
DESCRIPTION = "Common-Lisp ROS message and service generators."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "genmsg"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "03f0c73d79e35d4704289b18e4e4b6f2"
SRC_URI[sha256sum] = "c12ae21100b11635672c17bdeb165c17ae74bddf4ce8f9bc97711fed0eef9698"
inherit catkin

View File

@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=7;endline=7;md5=d566ef916e9dedc
DEPENDS = "genmsg"
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "c123dcaa61db6004d08fdffe3fd2c445"
SRC_URI[sha256sum] = "0c02f9e7c30f54e5908589cf3b0e84d457cf95926173aa377b9ff8f5819487c7"
SRC_URI[md5sum] = "2795b9479e9e64f22f2190b85a6a41fc"
SRC_URI[sha256sum] = "2bb21cadf9f7635e0567520680b979f156e70fba673b0a82f09cad4553f7f372"
inherit catkin

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "f851990c58213775a2d4cb224f9f3dab"
SRC_URI[sha256sum] = "d9a2639225e86ef58db9bd308234c336f09c20ae4f3e5fc91fcb64b0bd002e2e"
SRC_URI[md5sum] = "2e79be808c5b92ebf337849bae94c561"
SRC_URI[sha256sum] = "b9f0a7db4d4b1469c92b1fab1a6f17a0f3018a3e0da437194dc1208453de816d"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9de
DEPENDS = "angles boost libeigen sensor-msgs roscpp tf"
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "effc25dcef8c05e68895584ba8d59ca2"
SRC_URI[sha256sum] = "d10f3201720199d2654583c3b2f5b63fe57dcb1ad50ebedbaf8b82f87b9be6d6"
SRC_URI[md5sum] = "7ce41e57b1fdedee4bb4d181e7dd150b"
SRC_URI[sha256sum] = "7f3a8a9c2ebf0d93014ff62fc1dd38999945ea1bffb5fe30c7622e8765ea3e5d"
S = "${WORKDIR}/${ROS_SP}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-planning/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "e6d44439bd062a75ec15d8fd845a657c"
SRC_URI[sha256sum] = "9c1ca5fca90e59876782b92e4c67339ce2df84eedc5af4358c5a4b42c6aaed30"
SRC_URI[md5sum] = "fdffc9ca86cbb1f05817dd2d4952d41d"
SRC_URI[sha256sum] = "430f7bf21c030dabc5d30eb5fd7a1794a1606b9a94c573fa1f27d4ce8f49dce5"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "e396236e352fde3f961d04026621ec17"
SRC_URI[sha256sum] = "78c5dde9070597e6f581a354ca66ef60422b9e84f9e7ace81b7cfb4481db2208"
SRC_URI[md5sum] = "cd0d8199e42ba1d53280c00e528f1ec3"
SRC_URI[sha256sum] = "c4eb43f05c7bc26ed99d8e2873f3cc700374a49b7fc4732a32a6fb5abb8cdd13"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -152,7 +152,9 @@ RDEPENDS_${PN} = "\
roslint \
ros-pocketsphinx \
sound-play \
timer-tests \
communication-tests \
cyclic-timer-tests \
oneshot-timer-tests \
urdfdom-headers \
urdfdom-py \
urdf-tutorial \

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "f561ebda19fa6e737d5f06e49e925be4"
SRC_URI[sha256sum] = "3572418e3149b54493770695e5241584f5daf9e849ab70007b16d4ce848d7e12"
SRC_URI[md5sum] = "76d68100d0b261b437953a0c1e36999d"
SRC_URI[sha256sum] = "57cab5aec103eb4a2a6711c3ce364a03e58ed79d39b600efa2c231527a470a33"
SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch;patchdir=../.."

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "db55e35ae20609cdc2f874ceabf370af"
SRC_URI[sha256sum] = "1ae5886a54519c500669c98c9832f02d84f259d3ddb6a30fb78c6bb42b2b3a94"
SRC_URI[md5sum] = "9b3f69de87dbf80372e5ede945569213"
SRC_URI[sha256sum] = "009449b95205abd5e64e1c2381b44d94622baeff343b613b088846441d3b8d68"
ROS_PKG_SUBDIR ?= ""
S = "${WORKDIR}/${ROS_SP}/${ROS_PKG_SUBDIR}/${ROS_BPN}"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Libraries and examples for ROSserial usage on Arduino/AVR Platforms."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "std-msgs sensor-msgs geometry-msgs nav-msgs rosserial-client message-generation"

View File

@ -1,6 +1,6 @@
DESCRIPTION = "Generalized client side source for rosserial."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
require rosserial.inc

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Libraries and examples for ROSserial usage on Embedded Linux Enviroments"
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "std-msgs sensor-msgs geometry-msgs nav-msgs rosserial-client"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "Messages for automatic topic configuration using rosserial."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "message-generation"

View File

@ -1,7 +1,7 @@
DESCRIPTION = "A Python-based implementation of the ROS serial protocol."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=d566ef916e9dedc494f5f793a6690ba5"
require rosserial.inc

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-drivers/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "98225960a1cb3f76c490c41d44913b42"
SRC_URI[sha256sum] = "f2ea608c5d909e7249817fdc0a7fea67945fbf12e0d24fdfa4dd095b86ea8a75"
SRC_URI[md5sum] = "2c6daf8212856f002506c370095c28f8"
SRC_URI[sha256sum] = "f0047e40b1643ba128cf679a014a27790cfeb358bef768212ec932bb62a9b8c7"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

View File

@ -1,6 +1,6 @@
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "f622ca8ec2a85f5d854e06d0b64fc627"
SRC_URI[sha256sum] = "4e94b2087cad13f48534163f36bae47db1e09b388032f35e7e8eae270514719a"
SRC_URI[md5sum] = "7a73f7d1f84ad0cb82297bcfd06dec29"
SRC_URI[sha256sum] = "dacc8dfb6a5b81268ee65bb52dc0a0ef7bd22ba46dc2f1e925d846849a657c47"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"