From 79f092f0ccc0726bcf3f720376271b6762c0ef6d Mon Sep 17 00:00:00 2001
From: Dirk Thomas <dthomas@willowgarage.com>
Date: Wed, 30 May 2012 20:31:28 +0000
Subject: [PATCH] migrated to stack.xml

---
 CMakeLists.txt |  2 +-
 setup.py       | 15 +++++++--------
 stack.xml      | 39 ++++++++++++++++++++++++++-------------
 stack.yaml     | 10 ----------
 4 files changed, 34 insertions(+), 32 deletions(-)
 delete mode 100644 stack.yaml

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7862032c..ce732599 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ install(PROGRAMS
         tools/rosunit/scripts/check_test_ran.py
         DESTINATION share/rosunit/bin)
 
-install(FILES stack.yaml DESTINATION share/${PROJECT_NAME})
+install(FILES stack.xml DESTINATION share/${PROJECT_NAME})
 
 install(DIRECTORY tools/roscreate/templates/
   DESTINATION share/roscreate/templates
diff --git a/setup.py b/setup.py
index 9a623421..817481a1 100644
--- a/setup.py
+++ b/setup.py
@@ -1,17 +1,16 @@
 #!/usr/bin/env python
 
+import rospkg.stack
 from setuptools import setup
-
 import sys
-sys.path.insert(0, 'src')
 
-version = '0.0.0'
 try:
-    import yaml
-    d = yaml.load(open('stack.yaml'))
-    version = d['Version']
-except:
-    pass
+    version = rospkg.stack.parse_stack_file('stack.xml').version
+except Exception, e:
+    print >> sys.stderr, 'Could not extract version from your stack.xml:\n%s' % e
+    sys.exit(-1)
+
+sys.path.insert(0, 'src')
 
 setup(name='roslib',
       version=version,
diff --git a/stack.xml b/stack.xml
index 78e08af1..3a711941 100644
--- a/stack.xml
+++ b/stack.xml
@@ -1,16 +1,29 @@
 <stack>
-  <description brief="ROS core">
-<p>
-ROS is an open-source, meta-operating system for your robot. It provides the services you would expect from an operating system, including hardware abstraction, low-level device control, implementation of commonly-used functionality, message-passing between processes, and package management. It also provides tools and libraries for obtaining, building, writing, and running code across multiple computers. 
-
-</p>
-<p>
-The ROS runtime "graph" is a peer-to-peer network of processes that are loosely coupled using the ROS communication infrastructure. ROS implements several different styles of communication, including synchronous RPC-style communication over Services, asynchronous streaming of data over Topics, and storage of data on a Parameter Server. These are explained in greater detail in our Conceptual Overview.
-</p>
-
-  </description>
-  <author>Eric Berger, Ken Conley, Josh Faust, Tully Foote, Brian Gerkey, Jeremy Leibs, Morgan Quigley, Rob Wheeler</author>
-  <license>BSD</license>
+  <name>ros</name>
+  <version>1.8.7</version>
+  <description brief="ROS core">ROS packaging system</description>
+  <author>Eric Berger, Ken Conley, Josh Faust, Tully Foote, Brian Gerkey, Jeremy Leibs, Morgan Quigley, Rob Wheeler, et al</author>
+  <maintainer>Ken Conley kwc@willowgarage.com</maintainer>
+  <license>BSD</license>  
+  <copyright>Willow Garage</copyright>
+  <url>http://www.ros.org/wiki/ROS</url>
   <review status="doc reviewed" notes=""/>
-  <url>http://ros.org/wiki/ROS</url>
+
+  <build_depends>boost</build_depends>
+  <build_depends>bzip2</build_depends>
+  <build_depends>catkin</build_depends>
+  <build_depends>gtest</build_depends>
+  <build_depends>pkg-config</build_depends>
+  <build_depends>python</build_depends>
+  <build_depends>python-nose</build_depends>
+  <build_depends>python-rospkg</build_depends>
+  <build_depends>rospack</build_depends>
+
+  <depends>boost</depends>
+  <depends>bzip2</depends>
+  <depends>gtest</depends>
+  <depends>python</depends>
+  <depends>python-nose</depends>
+  <depends>python-rospkg</depends>
+  <depends>rospack</depends>
 </stack>
diff --git a/stack.yaml b/stack.yaml
deleted file mode 100644
index 8a7bd520..00000000
--- a/stack.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-Catkin-ProjectName: ros
-Version: 1.8.7
-Depends: catkin, rospack, gtest, bzip2, python, boost, python-nose, python-rospkg, pkg-config
-Description: ROS packaging system
-Author: Eric Berger, Ken Conley, Josh Faust, Tully Foote, Brian Gerkey, Jeremy Leibs, Morgan Quigley, Rob Wheeler, et al
-Maintainer: Ken Conley <kwc@willowgarage.com>
-Homepage: http://www.ros.org
-
-Catkin-CopyrightType: willowgarage
-Catkin-DebRulesType: cmake