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

diagnostics: updating to 1.8.2 

The patch for diagnostics has been merged in version 1.8.2, and
hence is removed.
This commit is contained in:
Lukas Bulwahn 2014-04-10 07:22:19 +02:00
parent 3cf27fa67c
commit 3194880a62
6 changed files with 5 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
recipes-ros/diagnostics/diagnostic-aggregator_1.8.0.bb → recipes-ros/diagnostics/diagnostic-aggregator_1.8.2.bb
View File

2
recipes-ros/diagnostics/diagnostic-analysis_1.8.0.bb → recipes-ros/diagnostics/diagnostic-analysis_1.8.2.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "The diagnostic_analysis package can convert a log of diagnostics data into a series of CSV files."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=11;endline=11;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=12;endline=12;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "diagnostic-msgs rosbag roslib rostest"

2
recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.0.bb → recipes-ros/diagnostics/diagnostic-common-diagnostics_1.8.2.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "The diagnostic_analysis package can convert a log of diagnostics data into a series of CSV files."
SECTION = "devel"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://package.xml;beginline=8;endline=8;md5=d566ef916e9dedc494f5f793a6690ba5"
LIC_FILES_CHKSUM = "file://package.xml;beginline=9;endline=9;md5=d566ef916e9dedc494f5f793a6690ba5"
DEPENDS = "rospy"

2
recipes-ros/diagnostics/diagnostic-updater_1.8.0.bb → recipes-ros/diagnostics/diagnostic-updater_1.8.2.bb
View File

@ -1,7 +1,7 @@
DESCRIPTION = "diagnostic_updater contains tools for easily updating diagnostics."
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 = "diagnostic-msgs roscpp rostest std-msgs"

6
recipes-ros/diagnostics/diagnostics.inc
View File

@ -1,8 +1,6 @@
SRC_URI = "https://github.com/ros/${ROS_SPN}/archive/${PV}.tar.gz;downloadfilename=${ROS_SP}.tar.gz"
SRC_URI[md5sum] = "d77988921c0ca1bf2bda80fa73af14fa"
SRC_URI[sha256sum] = "984d922cb984d00a97264fbf271c017c68db9f0f9d72b8d96344ab8a417c1c2b"
SRC_URI += "file://0001-check-for-CATKIN_ENABLE_TESTING.patch;patchdir=.."
SRC_URI[md5sum] = "84abf8a66c09e061b93f087a9f7d8560"
SRC_URI[sha256sum] = "2f4e4fd1351afdc8e0469730030566b03bd3f7308904ddf7593d3cf98797515d"
S = "${WORKDIR}/${ROS_SP}/${ROS_BPN}"

119
recipes-ros/diagnostics/files/0001-check-for-CATKIN_ENABLE_TESTING.patch
View File

@ -1,119 +0,0 @@
From 31910c5be5938d099131e5ec254561afe963b63e Mon Sep 17 00:00:00 2001
From: Lukas Bulwahn <lukas.bulwahn@oss.bmw-carit.de>
Date: Wed, 16 Oct 2013 08:05:34 +0200
Subject: [PATCH] check for CATKIN_ENABLE_TESTING
---
diagnostic_aggregator/CMakeLists.txt | 20 +++++++++++---------
diagnostic_aggregator/package.xml | 2 +-
diagnostic_analysis/CMakeLists.txt | 4 +++-
diagnostic_analysis/package.xml | 2 +-
diagnostic_updater/CMakeLists.txt | 6 ++++--
diagnostic_updater/package.xml | 2 +-
6 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/diagnostic_aggregator/CMakeLists.txt b/diagnostic_aggregator/CMakeLists.txt
index 07c0d41..96761b4 100644
--- a/diagnostic_aggregator/CMakeLists.txt
+++ b/diagnostic_aggregator/CMakeLists.txt
@@ -31,18 +31,20 @@ target_link_libraries(aggregator_node ${catkin_LIBRARIES}
${PROJECT_NAME}
)
-add_rostest(test/launch/test_agg.launch)
+if(CATKIN_ENABLE_TESTING)
+ add_rostest(test/launch/test_agg.launch)
-# Analyzer loader allows other users to test that Analyzers load
-catkin_add_gtest(analyzer_loader test/analyzer_loader.cpp)
-target_link_libraries(analyzer_loader diagnostic_aggregator)
-set_target_properties(analyzer_loader PROPERTIES EXCLUDE_FROM_ALL FALSE)
+ # Analyzer loader allows other users to test that Analyzers load
+ catkin_add_gtest(analyzer_loader test/analyzer_loader.cpp)
+ target_link_libraries(analyzer_loader diagnostic_aggregator)
+ set_target_properties(analyzer_loader PROPERTIES EXCLUDE_FROM_ALL FALSE)
-# Test Analyzer loader
-add_rostest(test/launch/test_loader.launch)
-add_rostest(test/launch/test_expected_stale.launch)
-add_rostest(test/launch/test_multiple_match.launch)
+ # Test Analyzer loader
+ add_rostest(test/launch/test_loader.launch)
+ add_rostest(test/launch/test_expected_stale.launch)
+ add_rostest(test/launch/test_multiple_match.launch)
+endif()
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
diff --git a/diagnostic_aggregator/package.xml b/diagnostic_aggregator/package.xml
index 5095b5f..3742104 100644
--- a/diagnostic_aggregator/package.xml
+++ b/diagnostic_aggregator/package.xml
@@ -12,7 +12,7 @@
<url type="website">http://www.ros.org/wiki/diagnostic_aggregator</url>
<!-- <url type="bugtracker"></url> -->
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>diagnostic_msgs</build_depend>
<build_depend>pluginlib</build_depend>
diff --git a/diagnostic_analysis/CMakeLists.txt b/diagnostic_analysis/CMakeLists.txt
index c4eb326..47b6737 100644
--- a/diagnostic_analysis/CMakeLists.txt
+++ b/diagnostic_analysis/CMakeLists.txt
@@ -6,4 +6,6 @@ find_package(catkin REQUIRED diagnostic_msgs rosbag roslib rostest)
catkin_package(DEPENDS diagnostic_msgs rosbag roslib)
-catkin_add_nosetests(test/bag_csv_test.py)
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_nosetests(test/bag_csv_test.py)
+endif()
diff --git a/diagnostic_analysis/package.xml b/diagnostic_analysis/package.xml
index 12d96a0..6e34c9f 100644
--- a/diagnostic_analysis/package.xml
+++ b/diagnostic_analysis/package.xml
@@ -16,7 +16,7 @@
<author>Eric Berger</author>
<author>Kevin Watts</author>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>diagnostic_msgs</build_depend>
<build_depend>rosbag</build_depend>
diff --git a/diagnostic_updater/CMakeLists.txt b/diagnostic_updater/CMakeLists.txt
index 1302ebe..85b4cea 100644
--- a/diagnostic_updater/CMakeLists.txt
+++ b/diagnostic_updater/CMakeLists.txt
@@ -12,8 +12,10 @@ include_directories(include ${catkin_INCLUDE_DIRS})
add_executable(example src/example.cpp)
target_link_libraries(example ${catkin_LIBRARIES})
-catkin_add_gtest(diagnostic_updater_test test/diagnostic_updater_test.cpp)
-add_rostest(test/diagnostic_updater_test.xml)
+if(CATKIN_ENABLE_TESTING)
+ catkin_add_gtest(diagnostic_updater_test test/diagnostic_updater_test.cpp)
+ add_rostest(test/diagnostic_updater_test.xml)
+endif()
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
diff --git a/diagnostic_updater/package.xml b/diagnostic_updater/package.xml
index 82287cc..85d44e9 100644
--- a/diagnostic_updater/package.xml
+++ b/diagnostic_updater/package.xml
@@ -14,7 +14,7 @@
<author>Jeremy Leibs</author>
<author>Blaise Gassend</author>
- <buildtool_depend>catkin</buildtool_depend>
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<build_depend>diagnostic_msgs</build_depend>
<build_depend>roscpp</build_depend>
--
1.8.1.2