Merge pull request #24 from meyerj/manifest-cleanup

Updated manifest.xml and package.xml for autoproj/rosdep compatibility
orocos-toolchain · Dec 3, 2014 · b31f9fc · b31f9fc
2 parents abef4ff + 6bf57fe
commit b31f9fc
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/manifest.xml b/manifest.xml
@@ -15,11 +15,11 @@
     <depend package="rtt" />
     <depend package="typelib" />
     <depend package="rtt_typelib" />
-    <depend package="tools/metaruby" />
-    <depend package="kramdown" optional="1" />
-    <depend package="libxslt" />
-    <depend package="nokogiri" />
-    <depend package="rake" />
-    <depend package="ruby" />
+    <depend package="utilrb" />
+    <depend package="metaruby" />
+    <depend_optional package="kramdown" />
+    <rosdep name="nokogiri" />
+    <rosdep name="rake" />
+    <rosdep name="ruby" />
 </package>
 
diff --git a/package.xml b/package.xml
@@ -10,16 +10,26 @@
   <maintainer email="orocos-dev@lists.mech.kuleuven.be">OCL Development Team</maintainer>
   <license>GPL v2 or later</license>
 
+  <url>http://rock-robotics.org/documentation/orogen</url>
+
   <buildtool_depend>cmake</buildtool_depend>
+  <run_depend>catkin</run_depend>
+
+  <build_depend>ruby</build_depend>
+
+  <run_depend>rtt</run_depend>
+  <run_depend>typelib</run_depend>
+  <run_depend>rtt_typelib</run_depend>
+  <run_depend>utilrb</run_depend>
+  <run_depend>metaruby</run_depend>
+  <run_depend>nokogiri</run_depend>
+  <run_depend>rake</run_depend>
+  <run_depend>ruby</run_depend>
+
   <export>
     <build_type>
       cmake
     </build_type>
   </export>
-  <build_depend>ruby</build_depend>
-
-  <run_depend>ruby</run_depend>
-  <run_depend>typelib</run_depend>
-  <run_depend>utilrb</run_depend>
 
 </package>