irb4400: minor manifest and build script cleanups.

Author: gavanderhoorn

abb_irb120_support/package.xml

@@ -30,7 +30,7 @@
   <maintainer email="[email protected]">Levi Armstrong (SwRI)</maintainer>
   <license>Apache2</license>
 
-  <url type="website">http://ros.org/wiki/abb_irb120_support</url>
+  <url type="website">http://wiki.ros.org/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>
 

abb_irb4400_support/CMakeLists.txt

@@ -9,14 +9,12 @@ catkin_package()
 if (CATKIN_ENABLE_TESTING)
   find_package(roslaunch REQUIRED)
   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)
+    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_irb4400_support/package.xml

@@ -1,33 +1,34 @@
+<?xml version="1.0"?>
 <package>
   <name>abb_irb4400_support</name>
   <version>0.1.0</version>
   <description>
     <p>
-      ROS Industrial support for the ABB IRB4400 (and variants).
+      ROS-Industrial support for the ABB IRB 4400 (and variants).
     </p>
     <p>
-      This package contains configuration data, 3D models and launch files 
-      for ABB IRB4400 manipulators. This currently includes the L30.
+      This package contains configuration data, 3D models and launch files
+      for ABB IRB 4400 manipulators. This currently includes the L30.
     </p>
     <p>
-      Joint limits and max joint velocities are based on the information in the 
+      Joint limits and max joint velocities are based on the information in the
       <a href="http://www05.abb.com/global/scot/scot352.nsf/veritydisplay/c90b98aaa057bd6ec12576cb00528ef6/$file/Product%20specification%204400%20M99%20BWOS3.2.pdf">
-      ABB IRB 4400 product specification document</a> (Article No: 3HAC 8770-1).  
-      All urdfs / xacros are based on the default motion and joint velocity 
-      limits, unless noted otherwise (ie: no support for high speed joints, 
+      ABB IRB 4400 product specification document</a> (Article No: 3HAC 8770-1).
+      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 
-      in this package, be sure to check they are correct for the particular 
+      Before using any of the configuration files and / or meshes included
+      in this package, be sure to check they are correct for the particular
       robot model and configuration you intend to use them with.
     </p>
   </description>
-  <author email="[email protected]">Dan Solomon (Southwest Research Institute)</author>
-  <maintainer email="[email protected]">Shaun Edwards (Southwest Research Institute)</maintainer>
+  <author>Dan Solomon</author>
+  <maintainer email="[email protected]">Shaun Edwards (SwRI)</maintainer>
   <license>Apache2</license>
 
-  <url type="website">http://ros.org/wiki/abb_irb4400_support</url>
+  <url type="website">http://wiki.ros.org/abb_irb4400_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>
 
@@ -36,8 +37,13 @@
   <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>