irb120: minor manifest and build script cleanups.

Author: gavanderhoorn

abb_irb120_support/CMakeLists.txt

@@ -8,10 +8,13 @@ catkin_package()
 
 if (CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
-  roslaunch_add_file_check(tests/roslaunch_test.xml)
+  roslaunch_add_file_check(tests/roslaunch_test.xml
+    DEPENDENCIES
+      # not nice, but industrial_robot_client doesn't prefix its targets
+      joint_trajectory_action
+      abb_driver_robot_state
+      abb_driver_motion_download_interface)
 endif()
 
-foreach(dir config launch meshes urdf)
-   install(DIRECTORY ${dir}/
-      DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach()
+install(DIRECTORY config launch meshes urdf
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})

abb_irb120_support/package.xml

@@ -1,20 +1,23 @@
+<?xml version="1.0"?>
 <package>
   <name>abb_irb120_support</name>
-  <version>0.2.0</version>
+  <version>0.1.0</version>
   <description>
     <p>
       ROS-Industrial support for the ABB IRB 120 (and variants).
     </p>
     <p>
       This package contains configuration data, 3D models and launch files
-      for ABB IRB 120 manipulators. This includes the base model (120) and the 120T.
+      for ABB IRB 120 manipulators. This includes the base model (120) and
+      the 120T.
     </p>
     <p>
-      Joint limits and max joint velocities are based on the information in the 
-      <a href="http://new.abb.com/products/robotics/industrial-robots/irb-120/irb-120-data">ABB 
-      IRB 120 technical data sheet</a> (Version: ROB0149EN_D, May 2012). All URDFs / XACROs are 
-      based on the default motion and joint velocity limits, unless noted otherwise (ie: no 
-      support for high speed joints, extended / limited motion ranges or other options).
+      Joint limits and max joint velocities are based on the information in the
+      <a href="http://new.abb.com/products/robotics/industrial-robots/irb-120/irb-120-data">
+      ABB IRB 120 technical data sheet</a> (Version: ROB0149EN_D, May 2012).
+      All urdfs / xacros are based on the default motion and joint velocity
+      limits, unless noted otherwise (ie: no support for high speed joints,
+      extended / limited motion ranges or other options).
     </p>
     <p>
       Before using any of the configuration files and / or meshes included
@@ -24,18 +27,25 @@
   </description>
   <author email="[email protected]">Mark Culleton (Trinity College Dublin)</author>
   <maintainer email="[email protected]">Mark Culleton (Trinity College Dublin)</maintainer>
+  <maintainer email="[email protected]">Levi Armstrong (SwRI)</maintainer>
   <license>Apache2</license>
 
-  <url type="website">http://wiki.ros.org/abb</url>
+  <url type="website">http://ros.org/wiki/abb_irb120_support</url>
   <url type="bugtracker">https://github.com/ros-industrial/abb_experimental/issues</url>
   <url type="repository">https://github.com/ros-industrial/abb_experimental</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>roslaunch</build_depend>
+  <build_depend version_gte="1.9.55">roslaunch</build_depend>
 
   <run_depend>abb_driver</run_depend>
+  <run_depend>abb_resources</run_depend>
   <run_depend>joint_state_publisher</run_depend>
   <run_depend>robot_state_publisher</run_depend>
   <run_depend>rviz</run_depend>
+  <run_depend>xacro</run_depend>
+
+  <export>
+    <architecture_independent/>
+  </export>
 </package>