p71924506
/
meta-ros
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ros-comm: Backport relocation changes 

Signed-off-by: Stefan Herbrechtsmeier <stefan@herbrechtsmeier.net>
This commit is contained in:
Stefan Herbrechtsmeier 2013-08-13 16:20:04 +02:00 committed by Lukas Bulwahn
parent a647c358a0
commit 68b1e013a5
3 changed files with 85 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
recipes-ros/ros-comm/files/0001-fix-roslaunch-check-script-in-install-space.patch Normal file
View File

@ -0,0 +1,25 @@
From 60f0f657bd9aabfedba0b00374ae8398e5e92359 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@osrfoundation.org>
Date: Wed, 24 Jul 2013 00:19:21 -0700
Subject: [PATCH] fix roslaunch check script in install space (fix #257)
---
tools/roslaunch/cmake/roslaunch-extras.cmake.em | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/roslaunch/cmake/roslaunch-extras.cmake.em b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
index 10c0ce2..bb1ae40 100644
--- a/tools/roslaunch/cmake/roslaunch-extras.cmake.em
+++ b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
@@ -5,7 +5,7 @@
set(roslaunch_check_script @(CMAKE_CURRENT_SOURCE_DIR)/scripts/roslaunch-check)
@[else]@
# set path to roslaunch-check.py installspace
-set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/${CATKIN_PACKAGE_SHARE_DESTINATION}/scripts/roslaunch-check)
+set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)/scripts/roslaunch-check)
@[end if]@
#
--
1.8.1.6

57
recipes-ros/ros-comm/files/0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch Normal file
View File

@ -0,0 +1,57 @@
From e0366e14128ed0083e9450bbe9f98fd9b2806454 Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@osrfoundation.org>
Date: Fri, 26 Jul 2013 13:37:23 -0700
Subject: [PATCH] resolve roslaunch/rostest paths in installspace at runtime
without find_program() (ros/catkin#490)
---
tools/roslaunch/cmake/roslaunch-extras.cmake.em | 6 +++---
tools/rostest/cmake/rostest-extras.cmake.em | 12 ++++--------
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/tools/roslaunch/cmake/roslaunch-extras.cmake.em b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
index bb1ae40..6df3a14 100644
--- a/tools/roslaunch/cmake/roslaunch-extras.cmake.em
+++ b/tools/roslaunch/cmake/roslaunch-extras.cmake.em
@@ -1,11 +1,11 @@
# generated from ros_comm/tools/roslaunch/cmake/roslaunch-extras.cmake.em
@[if DEVELSPACE]@
-# set path to roslaunch-check.py in develspace
+# set path to roslaunch-check script in develspace
set(roslaunch_check_script @(CMAKE_CURRENT_SOURCE_DIR)/scripts/roslaunch-check)
@[else]@
-# set path to roslaunch-check.py installspace
-set(roslaunch_check_script @(CMAKE_INSTALL_PREFIX)/@(CATKIN_PACKAGE_SHARE_DESTINATION)/scripts/roslaunch-check)
+# set path to roslaunch-check script installspace
+set(roslaunch_check_script ${roslaunch_DIR}/../scripts/roslaunch-check)
@[end if]@
#
diff --git a/tools/rostest/cmake/rostest-extras.cmake.em b/tools/rostest/cmake/rostest-extras.cmake.em
index 1fca6bc..93ca8ff 100644
--- a/tools/rostest/cmake/rostest-extras.cmake.em
+++ b/tools/rostest/cmake/rostest-extras.cmake.em
@@ -8,15 +8,11 @@ function(add_rostest file)
_warn_if_skip_testing("add_rostest")
@[if DEVELSPACE]@
- # find program in develspace
- find_program_required(ROSTEST_EXE rostest
- PATHS @(PROJECT_SOURCE_DIR)/scripts
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ # bin in develspace
+ set(ROSTEST_EXE "@(PROJECT_SOURCE_DIR)/scripts/rostest")
@[else]@
- # find program in installspace
- find_program_required(ROSTEST_EXE rostest
- PATHS @(CMAKE_INSTALL_PREFIX)/bin
- NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
+ # bin in installspace
+ set(ROSTEST_EXE "${rostest_DIR}/../../../@(CATKIN_GLOBAL_BIN_DESTINATION)/rostest")
@[end if]@
cmake_parse_arguments(_rostest "" "WORKING_DIRECTORY" "ARGS" ${ARGN})
--
1.8.1.6

3
recipes-ros/ros-comm/ros-comm.inc
View File

@ -2,6 +2,9 @@ SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilena
SRC_URI[md5sum] = "2d4b8083abc6598857e01b698f4b0d20"
SRC_URI[sha256sum] = "44c5a076a604134e44d044e08b2c15b185aefac277b8632b5ca2d011ec8d3da6"
SRC_URI += "file://0001-fix-roslaunch-check-script-in-install-space.patch;patchdir=../.."
SRC_URI += "file://0002-resolve-roslaunch-rostest-paths-in-installspace-at-r.patch;patchdir=../.."
ROS_PKG_SUBDIR ?= ""
S = "${WORKDIR}/${ROS_SP}/${ROS_PKG_SUBDIR}/${ROS_BPN}"