From ffb7bce5124281559302f0f6032a94dd2e7d4b99 Mon Sep 17 00:00:00 2001
From: Brian Gerkey <brian@gerkey.org>
Date: Thu, 12 Jan 2012 23:20:09 +0000
Subject: [PATCH] Added <catkin/> tag to manifests and removed <depend> tags
 from them. Cleaned up installation of ros's manifests.

---
 CMakeLists.txt                  | 15 +++++++++++++--
 core/rosbuild/manifest.xml      |  1 +
 core/roslang/manifest.xml       |  5 +----
 core/roslib/manifest.xml        |  1 +
 tools/rosbash/manifest.xml      |  1 +
 tools/rosboost_cfg/manifest.xml |  1 +
 tools/rosclean/manifest.xml     |  1 +
 tools/roscreate/manifest.xml    |  2 +-
 tools/rosemacs/manifest.xml     |  1 +
 tools/rosmake/manifest.xml      |  1 +
 tools/rosunit/manifest.xml      |  2 +-
 11 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe73cecc..96c82ecc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -45,8 +45,19 @@ install(FILES core/roslang/cmake/roslang.cmake
         DESTINATION share/roslang/cmake)
 
 # install all manifests
-message("TODO: exclude rosbuild/manifest.xml and mk/manifest.xml from install_matching_to_share(), because the parent directories are installed explicitly")
-install_matching_to_share(manifest.xml)
+# we do them one-by-one instead of using install_matching_to_share()
+# because we need to exclude some of them (e.g., mk and rosbuild are
+# handled above, and some directories contains manifests that are only for
+# testing.).
+install(FILES core/roslang/manifest.xml DESTINATION share/roslang)
+install(FILES core/roslib/manifest.xml DESTINATION share/roslib)
+install(FILES tools/rosbash/manifest.xml DESTINATION share/rosbash)
+install(FILES tools/rosmake/manifest.xml DESTINATION share/rosmake)
+install(FILES tools/rosunit/manifest.xml DESTINATION share/rosunit)
+install(FILES tools/rosclean/manifest.xml DESTINATION share/rosclean)
+install(FILES tools/roscreate/manifest.xml DESTINATION share/roscreate)
+install(FILES tools/rosboost_cfg/manifest.xml DESTINATION share/rosboost_cfg)
+install(FILES tools/rosemacs/manifest.xml DESTINATION share/rosemacs)
 
 # install python package-relative scripts
 install(PROGRAMS 
diff --git a/core/rosbuild/manifest.xml b/core/rosbuild/manifest.xml
index 955ae264..7f5c0891 100644
--- a/core/rosbuild/manifest.xml
+++ b/core/rosbuild/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="ROS Build System">
 
 rosbuild contains scripts for managing the CMake-based build system for ROS. 
diff --git a/core/roslang/manifest.xml b/core/roslang/manifest.xml
index a53b5f8c..c0493848 100644
--- a/core/roslang/manifest.xml
+++ b/core/roslang/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="ROS client library base">
 
      roslang is a common package that all
@@ -11,9 +12,5 @@
   <license>BSD</license>
   <review status="Doc reviewed" notes="2010/01/10"/>
   <url>http://ros.org/wiki/roslang</url>
-  <depend package="rosbuild"/>
-  <export>
-    <rosbuild cmake_directory="${prefix}/cmake"/>
-  </export>
 </package>
 
diff --git a/core/roslib/manifest.xml b/core/roslib/manifest.xml
index b351f7ca..7cca35f9 100644
--- a/core/roslib/manifest.xml
+++ b/core/roslib/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="ROS base library">
 
       Base dependencies and support libraries for ROS. roslib contains many of the common data structures and tools that are shared across ROS client library implementations. 
diff --git a/tools/rosbash/manifest.xml b/tools/rosbash/manifest.xml
index 6ef35a5b..2c1ba82f 100644
--- a/tools/rosbash/manifest.xml
+++ b/tools/rosbash/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+<catkin/>
 <description brief="ros bash tools">
 
 Assorted shell commands for using ros with bash.
diff --git a/tools/rosboost_cfg/manifest.xml b/tools/rosboost_cfg/manifest.xml
index 374138f1..48885255 100644
--- a/tools/rosboost_cfg/manifest.xml
+++ b/tools/rosboost_cfg/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="Contains scripts for determining the boost configuration on a system">
 
      Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system
diff --git a/tools/rosclean/manifest.xml b/tools/rosclean/manifest.xml
index e55dec89..e24fcb67 100644
--- a/tools/rosclean/manifest.xml
+++ b/tools/rosclean/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="rosclean">
 
      rosclean: cleanup filesystem resources (e.g. log files).
diff --git a/tools/roscreate/manifest.xml b/tools/roscreate/manifest.xml
index 617e35d3..e37f2c39 100644
--- a/tools/roscreate/manifest.xml
+++ b/tools/roscreate/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="roscreate">
 
      roscreate contains tools that assist in the creation of ROS filesystem resources. There are currently
@@ -11,7 +12,6 @@
   <license>BSD</license>
   <review status="Doc reviewed" notes="2010/01/07"/>
   <url>http://ros.org/wiki/roscreate</url>
-  <depend package="roslib"/>
   <platform os="ubuntu" version="9.04"/>
   <platform os="ubuntu" version="9.10"/>
   <platform os="ubuntu" version="10.04"/>
diff --git a/tools/rosemacs/manifest.xml b/tools/rosemacs/manifest.xml
index c8016520..2b5ca26a 100644
--- a/tools/rosemacs/manifest.xml
+++ b/tools/rosemacs/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+<catkin/>
 <description brief="Emacs extension for ros">
 Ros tools for those who live in emacs.
 </description>
diff --git a/tools/rosmake/manifest.xml b/tools/rosmake/manifest.xml
index 39f2d9a8..b57ee9ac 100644
--- a/tools/rosmake/manifest.xml
+++ b/tools/rosmake/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
   <description brief="rosmake">
 
      rosmake is a ros dependency aware build tool which can be used to
diff --git a/tools/rosunit/manifest.xml b/tools/rosunit/manifest.xml
index 1eb980ff..ec00fb9c 100644
--- a/tools/rosunit/manifest.xml
+++ b/tools/rosunit/manifest.xml
@@ -1,4 +1,5 @@
 <package>
+  <catkin/>
 
   <description brief="Unit testing for ROS">
 
@@ -9,7 +10,6 @@
   <license>BSD</license>
   <review status="Doc reviewed" notes="2011/01/12, REP 100"/>
   <url>http://ros.org/wiki/rosunit</url>
-  <depend package="roslib"/>
   <export>
     <rosdoc config="rosdoc.yaml" />
   </export>