Merge pull request #304 from bulwahn/master-next
Updates until mid of November 2014
This commit is contained in:
KristofRobot
commit
574d14f745
|
|
@ -1,6 +1,6 @@
|
|||
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "babe5b8b8d6a29479f94a16ebe0bf19f"
|
||||
SRC_URI[sha256sum] = "7c4e186177dd5a0b904777d56ba921be5df1a1539ef6380dd5ede437184eb99c"
|
||||
SRC_URI[md5sum] = "01d9dc777a9a58800a0a6fc1bd9e5466"
|
||||
SRC_URI[sha256sum] = "177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
From 47c18f75d6a3950836d64b77d7e415ecca3755e9 Mon Sep 17 00:00:00 2001
|
||||
From: vmayoral <v.mayoralv@gmail.com>
|
||||
Date: Fri, 20 Sep 2013 13:22:53 +0200
|
||||
Subject: [PATCH] Fix the path added to CMAKE_MODULE_PATH.
|
||||
|
||||
@CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@ have been
|
||||
replaced with "${cmake_modules_DIR}/.." to make the module work.
|
||||
|
||||
Upstream-Status: Pending
|
||||
---
|
||||
cmake/cmake_modules-extras.cmake.installspace.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/cmake_modules-extras.cmake.installspace.in b/cmake/cmake_modules-extras.cmake.installspace.in
|
||||
index a4cd265..0701f02 100644
|
||||
--- a/cmake/cmake_modules-extras.cmake.installspace.in
|
||||
+++ b/cmake/cmake_modules-extras.cmake.installspace.in
|
||||
@@ -1,2 +1,2 @@
|
||||
# Prepend the installed cmake modules to the cmake module path
|
||||
-list(INSERT CMAKE_MODULE_PATH 0 @CMAKE_INSTALL_PREFIX@/@CATKIN_PACKAGE_SHARE_DESTINATION@/cmake/Modules)
|
||||
+list(INSERT CMAKE_MODULE_PATH 0 ${cmake_modules_DIR}/../cmake/Modules)
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -5,12 +5,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] = "428f2fd70cac67a3a3ccfcc8220894b4"
|
||||
SRC_URI[sha256sum] = "3e42c825a1aa956ef47dff0fff058320a8253e96c756a870a7c647902d30c875"
|
||||
|
||||
SRC_URI += "file://0001-Fix-the-path-added-to-CMAKE_MODULE_PATH.patch;striplevel=1;name=patch"
|
||||
SRC_URI[patch.md5sum] = "eba3a7eda081516f2113d6db70e881df"
|
||||
SRC_URI[patch.sha256sum] = "164a8e9d8595856be6a1523fa9ecc0c329961bb89bde2045fefc21306aae6de4"
|
||||
SRC_URI[md5sum] = "46c3190968bf5f2d4c05ba6424372e40"
|
||||
SRC_URI[sha256sum] = "298a7f29e7bda94c2117f5cd8fcbe9cbf56f79c4328e036639bb5f417113165c"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}"
|
||||
|
||||
|
|
@ -4,8 +4,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] = "b5b3ba33ca3b0ed76df4002246df1e8e"
|
||||
SRC_URI[sha256sum] = "90260988c6af8f4190e9340926e3cc76f1bf1ff4ad8db5857dcc4068f96d8666"
|
||||
SRC_URI[md5sum] = "20e50f93a1faa507f024a10f7d9c0383"
|
||||
SRC_URI[sha256sum] = "bd032aa99ce01cc4b2785a9c55cc3f18fb2712ef1af0a5347cf0dd6636a86efc"
|
||||
|
||||
inherit catkin
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "cd0d8199e42ba1d53280c00e528f1ec3"
|
||||
SRC_URI[sha256sum] = "c4eb43f05c7bc26ed99d8e2873f3cc700374a49b7fc4732a32a6fb5abb8cdd13"
|
||||
SRC_URI[md5sum] = "0d5e42e92ff148c144dfce0e10334556"
|
||||
SRC_URI[sha256sum] = "3c0d916b43ceec53f0de24b7441be08dc2ca6a92e91985eb1e38e89d955e5776"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=19;endline=19;md5=d566ef916e9de
|
|||
DEPENDS = "dynamic-reconfigure nodelet nodelet-topic-tools message-filters tf rosbag pcl pcl-conversions"
|
||||
|
||||
SRC_URI = "https://github.com/ros-perception/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "29525781041520e5f9bcf165bc654223"
|
||||
SRC_URI[sha256sum] = "f1da22f4b06e415e53b18a39094a10455f00efa92fe1301a918cde1ff87dcd7b"
|
||||
SRC_URI[md5sum] = "0b615b00398d0c78c415daa6b691ac3a"
|
||||
SRC_URI[sha256sum] = "7ba382c74bd284334b3c1a39fe97ddea1fa44f429a66f5f69d8586d379dff0ff"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
From 00fbc3fa30d78c10e13ecd04d85ecf98a39a4bb2 Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Sun, 27 Jul 2014 09:07:29 +0200
|
||||
Subject: [PATCH] make rostest in CMakeLists optional (ros/rosdistro#3010)
|
||||
|
||||
Upstream-Status: Accepted
|
||||
---
|
||||
controller_manager_tests/CMakeLists.txt | 3 ++-
|
||||
joint_limits_interface/CMakeLists.txt | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/controller_manager_tests/CMakeLists.txt b/controller_manager_tests/CMakeLists.txt
|
||||
index 64731bd..badc147 100644
|
||||
--- a/controller_manager_tests/CMakeLists.txt
|
||||
+++ b/controller_manager_tests/CMakeLists.txt
|
||||
@@ -29,7 +29,7 @@ if(USE_ROSBUILD)
|
||||
else()
|
||||
|
||||
# Load catkin and all dependencies required for this package
|
||||
- find_package(catkin REQUIRED COMPONENTS rostest controller_manager controller_interface control_toolbox)
|
||||
+ find_package(catkin REQUIRED COMPONENTS controller_manager controller_interface control_toolbox)
|
||||
|
||||
include_directories(include ${Boost_INCLUDE_DIR} ${catkin_INCLUDE_DIRS})
|
||||
|
||||
@@ -54,6 +54,7 @@ else()
|
||||
target_link_libraries(dummy_app ${PROJECT_NAME} ${catkin_LIBRARIES})
|
||||
|
||||
if(CATKIN_ENABLE_TESTING)
|
||||
+ find_package(rostest)
|
||||
add_executable(cm_test test/cm_test.cpp)
|
||||
add_dependencies(tests cm_test)
|
||||
target_link_libraries(cm_test ${GTEST_LIBRARIES} ${catkin_LIBRARIES})
|
||||
diff --git a/joint_limits_interface/CMakeLists.txt b/joint_limits_interface/CMakeLists.txt
|
||||
index fedaadd..f8305f1 100644
|
||||
--- a/joint_limits_interface/CMakeLists.txt
|
||||
+++ b/joint_limits_interface/CMakeLists.txt
|
||||
@@ -25,7 +25,6 @@ else() # catkin
|
||||
|
||||
find_package(catkin REQUIRED
|
||||
roscpp
|
||||
- rostest
|
||||
hardware_interface
|
||||
urdfdom
|
||||
)
|
||||
@@ -49,6 +48,8 @@ else() # catkin
|
||||
)
|
||||
|
||||
if(CATKIN_ENABLE_TESTING)
|
||||
+ find_package(rostest)
|
||||
+
|
||||
catkin_add_gtest(joint_limits_interface_test test/joint_limits_interface_test.cpp)
|
||||
target_link_libraries(joint_limits_interface_test ${catkin_LIBRARIES})
|
||||
|
||||
--
|
||||
1.9.3
|
||||
|
||||
|
|
@ -1,8 +1,6 @@
|
|||
SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "4eadd134fcb828a341fc65ff521f7e5c"
|
||||
SRC_URI[sha256sum] = "7bc3bfde309e0938cf2cd639d97e95c06e837c140831357378df861e3b657577"
|
||||
|
||||
SRC_URI += "file://0001-make-rostest-in-CMakeLists-optional-ros-rosdistro-30.patch;patchdir=.."
|
||||
SRC_URI[md5sum] = "58d4b8a8d98120bb3a46cee07168287d"
|
||||
SRC_URI[sha256sum] = "48f841a2a4f048d08149488028289da8b8374a2aab91c5e2c628300a574cac37"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +0,0 @@
|
|||
From 79856f596b827981fb5dad854c56347b912836fd Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Thu, 31 Jul 2014 21:06:41 +0200
|
||||
Subject: [PATCH] gripper_action_controller: drop unneeded rostest dependency
|
||||
|
||||
Upstream-Status: Accepted
|
||||
---
|
||||
gripper_action_controller/CMakeLists.txt | 1 -
|
||||
gripper_action_controller/package.xml | 1 -
|
||||
2 files changed, 2 deletions(-)
|
||||
|
||||
diff --git a/gripper_action_controller/CMakeLists.txt b/gripper_action_controller/CMakeLists.txt
|
||||
index 555ec69..2b925a9 100644
|
||||
--- a/gripper_action_controller/CMakeLists.txt
|
||||
+++ b/gripper_action_controller/CMakeLists.txt
|
||||
@@ -17,7 +17,6 @@ find_package(catkin
|
||||
realtime_tools
|
||||
control_msgs
|
||||
trajectory_msgs
|
||||
- rostest
|
||||
controller_manager
|
||||
xacro
|
||||
)
|
||||
diff --git a/gripper_action_controller/package.xml b/gripper_action_controller/package.xml
|
||||
index 513321b..2607005 100644
|
||||
--- a/gripper_action_controller/package.xml
|
||||
+++ b/gripper_action_controller/package.xml
|
||||
@@ -49,7 +49,6 @@
|
||||
<build_depend>controller_manager</build_depend>
|
||||
<build_depend>hardware_interface</build_depend>
|
||||
<build_depend>realtime_tools</build_depend>
|
||||
- <build_depend>rostest</build_depend>
|
||||
<build_depend>trajectory_msgs</build_depend>
|
||||
<build_depend>urdf</build_depend>
|
||||
<build_depend>xacro</build_depend>
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -7,5 +7,3 @@ DEPENDS = "actionlib angles cmake-modules roscpp urdf control-toolbox controller
|
|||
hardware-interface realtime-tools control-msgs trajectory-msgs controller-manager xacro"
|
||||
|
||||
require ros-controllers.inc
|
||||
|
||||
SRC_URI += "file://0001-gripper_action_controller-drop-unneeded-rostest-depe.patch;striplevel=2"
|
||||
|
|
@ -1,90 +0,0 @@
|
|||
From 9729165a4725b2a70d6c8d3690da76213bc8b5ec Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Thu, 10 Apr 2014 07:31:32 +0200
|
||||
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
|
||||
|
||||
Upstream-Status: Accepted
|
||||
---
|
||||
joint_trajectory_controller/CMakeLists.txt | 44 ++++++++++++++++--------------
|
||||
joint_trajectory_controller/package.xml | 2 +-
|
||||
2 files changed, 24 insertions(+), 22 deletions(-)
|
||||
|
||||
diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt
|
||||
index a1a3c4d..afc792d 100644
|
||||
--- a/joint_trajectory_controller/CMakeLists.txt
|
||||
+++ b/joint_trajectory_controller/CMakeLists.txt
|
||||
@@ -102,35 +102,37 @@ else()
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
)
|
||||
|
||||
- catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp)
|
||||
- target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES})
|
||||
+ if(CATKIN_ENABLE_TESTING)
|
||||
+ catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp)
|
||||
+ target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES})
|
||||
|
||||
- catkin_add_gtest(trajectory_interface_test test/trajectory_interface_test.cpp)
|
||||
- target_link_libraries(trajectory_interface_test ${catkin_LIBRARIES})
|
||||
+ catkin_add_gtest(trajectory_interface_test test/trajectory_interface_test.cpp)
|
||||
+ target_link_libraries(trajectory_interface_test ${catkin_LIBRARIES})
|
||||
|
||||
- catkin_add_gtest(joint_trajectory_segment_test test/joint_trajectory_segment_test.cpp)
|
||||
- target_link_libraries(joint_trajectory_segment_test ${catkin_LIBRARIES})
|
||||
+ catkin_add_gtest(joint_trajectory_segment_test test/joint_trajectory_segment_test.cpp)
|
||||
+ target_link_libraries(joint_trajectory_segment_test ${catkin_LIBRARIES})
|
||||
|
||||
- catkin_add_gtest(joint_trajectory_msg_utils_test test/joint_trajectory_msg_utils_test.cpp)
|
||||
- target_link_libraries(joint_trajectory_msg_utils_test ${catkin_LIBRARIES})
|
||||
+ catkin_add_gtest(joint_trajectory_msg_utils_test test/joint_trajectory_msg_utils_test.cpp)
|
||||
+ target_link_libraries(joint_trajectory_msg_utils_test ${catkin_LIBRARIES})
|
||||
|
||||
- catkin_add_gtest(init_joint_trajectory_test test/init_joint_trajectory_test.cpp)
|
||||
- target_link_libraries(init_joint_trajectory_test ${catkin_LIBRARIES})
|
||||
+ catkin_add_gtest(init_joint_trajectory_test test/init_joint_trajectory_test.cpp)
|
||||
+ target_link_libraries(init_joint_trajectory_test ${catkin_LIBRARIES})
|
||||
|
||||
- add_rostest_gtest(tolerances_test
|
||||
- test/tolerances.test
|
||||
- test/tolerances_test.cpp)
|
||||
- target_link_libraries(tolerances_test ${catkin_LIBRARIES})
|
||||
+ add_rostest_gtest(tolerances_test
|
||||
+ test/tolerances.test
|
||||
+ test/tolerances_test.cpp)
|
||||
+ target_link_libraries(tolerances_test ${catkin_LIBRARIES})
|
||||
|
||||
- add_executable(rrbot test/rrbot.cpp)
|
||||
- target_link_libraries(rrbot ${catkin_LIBRARIES})
|
||||
+ add_executable(rrbot test/rrbot.cpp)
|
||||
+ target_link_libraries(rrbot ${catkin_LIBRARIES})
|
||||
|
||||
- add_dependencies(tests rrbot)
|
||||
+ add_dependencies(tests rrbot)
|
||||
|
||||
- add_rostest_gtest(joint_trajectory_controller_test
|
||||
- test/joint_trajectory_controller.test
|
||||
- test/joint_trajectory_controller_test.cpp)
|
||||
- target_link_libraries(joint_trajectory_controller_test ${catkin_LIBRARIES})
|
||||
+ add_rostest_gtest(joint_trajectory_controller_test
|
||||
+ test/joint_trajectory_controller.test
|
||||
+ test/joint_trajectory_controller_test.cpp)
|
||||
+ target_link_libraries(joint_trajectory_controller_test ${catkin_LIBRARIES})
|
||||
+ endif()
|
||||
|
||||
# Install
|
||||
install(DIRECTORY include/${PROJECT_NAME}/
|
||||
diff --git a/joint_trajectory_controller/package.xml b/joint_trajectory_controller/package.xml
|
||||
index bc2ab39..54ba444 100644
|
||||
--- a/joint_trajectory_controller/package.xml
|
||||
+++ b/joint_trajectory_controller/package.xml
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
<author>Adolfo Rodriguez Tsouroukdissian</author>
|
||||
|
||||
- <buildtool_depend>catkin</buildtool_depend>
|
||||
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
|
||||
|
||||
<build_depend>cmake_modules</build_depend>
|
||||
<build_depend>actionlib</build_depend>
|
||||
--
|
||||
1.8.3.2
|
||||
|
||||
|
|
@ -1,43 +0,0 @@
|
|||
From f87e0c5c30bf99e0a45cfef7a8dc17a60ac41cba Mon Sep 17 00:00:00 2001
|
||||
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
|
||||
Date: Thu, 31 Jul 2014 21:18:31 +0200
|
||||
Subject: [PATCH] joint_trajectory_controller: make rostest in CMakeLists
|
||||
optional (ros/rosdistro#3010)
|
||||
|
||||
Upstream-Status: Accepted
|
||||
---
|
||||
joint_trajectory_controller/CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/joint_trajectory_controller/CMakeLists.txt b/joint_trajectory_controller/CMakeLists.txt
|
||||
index 06e9d93..9687ec3 100644
|
||||
--- a/joint_trajectory_controller/CMakeLists.txt
|
||||
+++ b/joint_trajectory_controller/CMakeLists.txt
|
||||
@@ -61,7 +61,6 @@ else()
|
||||
realtime_tools
|
||||
control_msgs
|
||||
trajectory_msgs
|
||||
- rostest
|
||||
controller_manager
|
||||
xacro
|
||||
)
|
||||
@@ -79,7 +78,6 @@ else()
|
||||
realtime_tools
|
||||
control_msgs
|
||||
trajectory_msgs
|
||||
- rostest
|
||||
controller_manager
|
||||
xacro
|
||||
INCLUDE_DIRS include
|
||||
@@ -103,6 +101,8 @@ else()
|
||||
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
|
||||
|
||||
if(CATKIN_ENABLE_TESTING)
|
||||
+ find_package(rostest)
|
||||
+
|
||||
catkin_add_gtest(quintic_spline_segment_test test/quintic_spline_segment_test.cpp)
|
||||
target_link_libraries(quintic_spline_segment_test ${catkin_LIBRARIES})
|
||||
|
||||
--
|
||||
1.7.9.5
|
||||
|
||||
|
|
@ -6,6 +6,3 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc
|
|||
DEPENDS = "actionlib angles cmake-modules control-toolbox controller-interface controller-manager control-msgs urdf xacro"
|
||||
|
||||
require ros-controllers.inc
|
||||
|
||||
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;striplevel=2 \
|
||||
file://0001-joint_trajectory_controller-make-rostest-in-CMakeLis.patch;striplevel=2"
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
SRC_URI = "https://github.com/ros-controls/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "bffda0ae65f2813a9ef908ec4f3ec26b"
|
||||
SRC_URI[sha256sum] = "fdf498d4e1acd9e0cb7c00abe201af993bbbf82e83ca4c5c9fc9a0ac73a62f91"
|
||||
SRC_URI[md5sum] = "bc1fefe5b293d95e1491e04594907b72"
|
||||
SRC_URI[sha256sum] = "407368e9bc7058b4baff400219613d157547c19394a3b139662d789c3a846feb"
|
||||
|
||||
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"
|
||||
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://package.xml;beginline=6;endline=6;md5=d566ef916e9dedc
|
|||
DEPENDS = "boost python-rospkg-native libtinyxml"
|
||||
|
||||
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
|
||||
SRC_URI[md5sum] = "d625279380f40e8033eeeb451f0e4b5b"
|
||||
SRC_URI[sha256sum] = "95e05ef70eb46e483c241278e9c0d7fb10390a61927c2593ce6f408682e1637d"
|
||||
SRC_URI[md5sum] = "3c152a2f6c39d205b373fa674b76244d"
|
||||
SRC_URI[sha256sum] = "1eaf4139e4286c4bce85c152989a2081cc04020c038dcef8d8b36d98fbb3778c"
|
||||
|
||||
inherit catkin
|
||||
|
||||
Loading…
Reference in New Issue