Merge pull request #253 from gavanderhoorn/cleanup_manifests

Cleanup all manifests and build scripts
ros-industrial · Nov 13, 2018 · 80c5299 · 80c5299
2 parents 5e99d7f + 20cfeaf
commit 80c5299
Show file tree

Hide file tree

Showing 30 changed files with 540 additions and 471 deletions.
diff --git a/motoman/package.xml b/motoman/package.xml
@@ -1,17 +1,28 @@
 <?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>motoman</name>
   <version>0.3.5</version>
-  <description>The motoman stack constains libraries, configuration files, and ROS nodes for controlling a Motoman robot from ROS-Industrial</description>
-  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <description>ROS-Industrial support for Yaskawa Motoman manipulators (metapackage).</description>
+  <author>Shaun Edwards</author>
+  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD</license>
+
   <url type="website">http://wiki.ros.org/motoman</url>
-  <author email="[email protected]">Shaun Edwards</author>
+  <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
+  <url type="repository">https://github.com/ros-industrial/motoman</url>
 
   <buildtool_depend>catkin</buildtool_depend>
 
   <exec_depend>motoman_driver</exec_depend>
+  <exec_depend>motoman_gp12_support</exec_depend>
+  <exec_depend>motoman_gp7_support</exec_depend>
+  <exec_depend>motoman_gp8_support</exec_depend>
+  <exec_depend>motoman_mh12_support</exec_depend>
+  <exec_depend>motoman_mh50_support</exec_depend>
   <exec_depend>motoman_mh5_support</exec_depend>
+  <exec_depend>motoman_motomini_support</exec_depend>
   <exec_depend>motoman_msgs</exec_depend>
   <exec_depend>motoman_sda10f_moveit_config</exec_depend>
   <exec_depend>motoman_sda10f_support</exec_depend>

diff --git a/motoman_driver/CMakeLists.txt b/motoman_driver/CMakeLists.txt
@@ -170,8 +170,8 @@ set_target_properties(motoman_motion_streaming_interface_bswap
   PREFIX "")
 
 add_executable(${PROJECT_NAME}_joint_trajectory_action
-  src/joint_trajectory_action_node.cpp
-  src/industrial_robot_client/joint_trajectory_action.cpp)
+  src/industrial_robot_client/joint_trajectory_action.cpp
+  src/joint_trajectory_action_node.cpp)
 target_link_libraries(${PROJECT_NAME}_joint_trajectory_action
   industrial_robot_client
   motoman_industrial_robot_client

diff --git a/motoman_driver/launch/robot_interface_streaming.launch b/motoman_driver/launch/robot_interface_streaming.launch
@@ -1,7 +1,7 @@
 <launch>
 
 <!-- This launch file provides a socket-based connection to industrial robots
-     that implement the standard ROS Industrial simple_message protocol.
+     that implement the standard ROS-Industrial simple_message protocol.
      *** Motion control is implemented by STREAMING path data to the robot ***
          (for DOWNLOAD-based path-control, use a different launch file)
 

diff --git a/motoman_driver/package.xml b/motoman_driver/package.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
   <name>motoman_driver</name>
   <version>0.3.5</version>
-  <description>
-    This package provides nodes for interfacing with Motoman industrial robot controllers.
-  </description>
+  <description>ROS-Industrial nodes for interfacing with Yaskawa Motoman robot controllers.</description>
   <author>Jeremy Zoss (Southwest Research Institute)</author>
   <author>Ted Miller (MotoROS) (Yaskawa Motoman)</author>
   <author>Eric Marcil (MotoROS) (Yaskawa Motoman)</author>
   <maintainer email="[email protected]">Jeremy Zoss (Southwest Research Institute)</maintainer>
+  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
   <license>BSD</license>
 
   <url type="website">http://wiki.ros.org/motoman_driver</url>

diff --git a/motoman_gp12_support/CMakeLists.txt b/motoman_gp12_support/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 2.8.3)
 
 project(motoman_gp12_support)
@@ -12,7 +11,5 @@ if (CATKIN_ENABLE_TESTING)
   roslaunch_add_file_check(test/launch_test.xml)
 endif()
 
-foreach(dir config launch meshes urdf)
-   install(DIRECTORY ${dir}/
-      DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+install(DIRECTORY config launch meshes urdf
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/motoman_gp12_support/package.xml b/motoman_gp12_support/package.xml
@@ -1,47 +1,53 @@
-
-<package>
- <name>motoman_gp12_support</name>
- <version>0.1.0</version>
- <description>
-  <p>
-      ROS Industrial support for the Motoman gp12 (and variants).
-    </p>
-  <p>
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>motoman_gp12_support</name>
+  <version>0.3.5</version>
+  <description>
+    <p>ROS-Industrial support for the Motoman GP12 (and variants).</p>
+    <p>
       This package contains configuration data, 3D models and launch files
-      for Motoman gp12 manipulators.
+      for Motoman GP12 manipulators.
     </p>
-  <p>
-   <b>Specifications</b>
-  </p>
-  <ul>
-   <li>gp12 - Default</li>
-  </ul>
-  <p>
+    <p>
+      <b>Specifications</b>
+    </p>
+    <ul>
+      <li>GP12 - Default</li>
+    </ul>
+    <p>
       Joint limits and maximum joint velocities are based on the information 
       found in the online 
       https://www.motoman.com/hubfs/Robots/GP12.pdf
       All urdfs are based on the default motion and joint velocity limits, 
       unless noted otherwise.
     </p>
-  <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
       robot model and configuration you intend to use them with.
     </p>
- </description>
- <author>Shaun Edwards</author>
- <maintainer email="[email protected]"/>
- <license>BSD</license>
- <url type="website">http://ros.org/wiki/motoman_gp12_support</url>
- <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
- <url type="repository">https://github.com/ros-industrial/motoman</url>
- <buildtool_depend>catkin</buildtool_depend>
- <build_depend>roslaunch</build_depend>
- <run_depend>motoman_driver</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rviz</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <export>
-  <architecture_independent/>
- </export>
+  </description>
+  <author>Eric Marcil</author>
+  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
+  <license>BSD</license>
+
+  <url type="website">http://wiki.ros.org/motoman_gp12_support</url>
+  <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
+  <url type="repository">https://github.com/ros-industrial/motoman</url>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <test_depend>roslaunch</test_depend>
+
+  <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>motoman_driver</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>xacro</exec_depend>
+
+  <export>
+    <architecture_independent/>
+  </export>
 </package>
diff --git a/motoman_gp7_support/CMakeLists.txt b/motoman_gp7_support/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 2.8.3)
 
 project(motoman_gp7_support)
@@ -12,7 +11,5 @@ if (CATKIN_ENABLE_TESTING)
   roslaunch_add_file_check(test/launch_test.xml)
 endif()
 
-foreach(dir config launch meshes urdf)
-   install(DIRECTORY ${dir}/
-      DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+install(DIRECTORY config launch meshes urdf
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/motoman_gp7_support/package.xml b/motoman_gp7_support/package.xml
@@ -1,47 +1,53 @@
-
-<package>
- <name>motoman_gp7_support</name>
- <version>0.1.0</version>
- <description>
-  <p>
-      ROS Industrial support for the Motoman gp7 (and variants).
-    </p>
-  <p>
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>motoman_gp7_support</name>
+  <version>0.3.5</version>
+  <description>
+    <p>ROS-Industrial support for the Motoman GP7 (and variants).</p>
+    <p>
       This package contains configuration data, 3D models and launch files
-      for Motoman gp7 manipulators.
+      for Motoman GP7 manipulators.
     </p>
-  <p>
-   <b>Specifications</b>
-  </p>
-  <ul>
-   <li>gp7 - Default</li>
-  </ul>
-  <p>
+    <p>
+      <b>Specifications</b>
+    </p>
+    <ul>
+      <li>GP7 - Default</li>
+    </ul>
+    <p>
       Joint limits and maximum joint velocities are based on the information 
       found in the online 
       https://www.motoman.com/hubfs/Robots/gp7.pdf
       All urdfs are based on the default motion and joint velocity limits, 
       unless noted otherwise.
     </p>
-  <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
       robot model and configuration you intend to use them with.
     </p>
- </description>
- <author>Eric Marcil</author>
- <maintainer email="[email protected]"/>
- <license>BSD</license>
- <url type="website">http://ros.org/wiki/motoman_gp7_support</url>
- <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
- <url type="repository">https://github.com/ros-industrial/motoman</url>
- <buildtool_depend>catkin</buildtool_depend>
- <build_depend>roslaunch</build_depend>
- <run_depend>motoman_driver</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rviz</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <export>
-  <architecture_independent/>
- </export>
+  </description>
+  <author>Eric Marcil</author>
+  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
+  <license>BSD</license>
+
+  <url type="website">http://wiki.ros.org/motoman_gp7_support</url>
+  <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
+  <url type="repository">https://github.com/ros-industrial/motoman</url>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <test_depend>roslaunch</test_depend>
+
+  <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>motoman_driver</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>xacro</exec_depend>
+
+  <export>
+    <architecture_independent/>
+  </export>
 </package>
diff --git a/motoman_gp8_support/CMakeLists.txt b/motoman_gp8_support/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 cmake_minimum_required(VERSION 2.8.3)
 
 project(motoman_gp8_support)
@@ -12,7 +11,5 @@ if (CATKIN_ENABLE_TESTING)
   roslaunch_add_file_check(test/launch_test.xml)
 endif()
 
-foreach(dir config launch meshes urdf)
-   install(DIRECTORY ${dir}/
-      DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+install(DIRECTORY config launch meshes urdf
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
diff --git a/motoman_gp8_support/package.xml b/motoman_gp8_support/package.xml
@@ -1,47 +1,53 @@
-
-<package>
- <name>motoman_gp8_support</name>
- <version>0.1.0</version>
- <description>
-  <p>
-      ROS Industrial support for the Motoman gp8 (and variants).
-    </p>
-  <p>
+<?xml version="1.0"?>
+<?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
+<package format="2">
+  <name>motoman_gp8_support</name>
+  <version>0.3.5</version>
+  <description>
+    <p>ROS-Industrial support for the Motoman GP8 (and variants).</p>
+    <p>
       This package contains configuration data, 3D models and launch files
-      for Motoman gp8 manipulators.
+      for Motoman GP8 manipulators.
     </p>
-  <p>
-   <b>Specifications</b>
-  </p>
-  <ul>
-   <li>gp8 - Default</li>
-  </ul>
-  <p>
+    <p>
+      <b>Specifications</b>
+    </p>
+    <ul>
+      <li>GP8 - Default</li>
+    </ul>
+    <p>
       Joint limits and maximum joint velocities are based on the information 
       found in the online 
       https://www.motoman.com/hubfs/Robots/gp8.pdf
       All urdfs are based on the default motion and joint velocity limits, 
       unless noted otherwise.
     </p>
-  <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
       robot model and configuration you intend to use them with.
     </p>
- </description>
- <author>Eric Marcil</author>
- <maintainer email="[email protected]"/>
- <license>BSD</license>
- <url type="website">http://ros.org/wiki/motoman_gp8_support</url>
- <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
- <url type="repository">https://github.com/ros-industrial/motoman</url>
- <buildtool_depend>catkin</buildtool_depend>
- <build_depend>roslaunch</build_depend>
- <run_depend>motoman_driver</run_depend>
- <run_depend>robot_state_publisher</run_depend>
- <run_depend>rviz</run_depend>
- <run_depend>joint_state_publisher</run_depend>
- <export>
-  <architecture_independent/>
- </export>
+  </description>
+  <author>Eric Marcil</author>
+  <maintainer email="[email protected]">Shaun Edwards</maintainer>
+  <maintainer email="[email protected]">G.A. vd. Hoorn (TU Delft Robotics Institute)</maintainer>
+  <license>BSD</license>
+
+  <url type="website">http://wiki.ros.org/motoman_gp8_support</url>
+  <url type="bugtracker">https://github.com/ros-industrial/motoman/issues</url>
+  <url type="repository">https://github.com/ros-industrial/motoman</url>
+
+  <buildtool_depend>catkin</buildtool_depend>
+
+  <test_depend>roslaunch</test_depend>
+
+  <exec_depend>joint_state_publisher</exec_depend>
+  <exec_depend>motoman_driver</exec_depend>
+  <exec_depend>robot_state_publisher</exec_depend>
+  <exec_depend>rviz</exec_depend>
+  <exec_depend>xacro</exec_depend>
+
+  <export>
+    <architecture_independent/>
+  </export>
 </package>
diff --git a/motoman_mh12_support/CMakeLists.txt b/motoman_mh12_support/CMakeLists.txt
@@ -1,11 +1,10 @@
 cmake_minimum_required(VERSION 2.8.3)
+
 project(motoman_mh12_support)
 
 find_package(catkin REQUIRED)
 
 catkin_package()
 
-foreach(dir config launch meshes urdf)
-   install(DIRECTORY ${dir}/
-      DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/${dir})
-endforeach(dir)
+install(DIRECTORY config launch meshes urdf
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})