stack.xml and setup.py now get version numbers from stack.yaml

This commit is contained in:
Ken Conley 2012-01-19 02:40:01 +00:00
parent c8bc6fd7a7
commit 95fbff3b00
2 changed files with 10 additions and 2 deletions

View File

@ -5,7 +5,7 @@ find_package(Boost COMPONENTS thread)
# call catkin_stack() so we can configure stack.xml
catkin_stack()
configure_file(stack.xml.in ${CMAKE_CURRENT_SOURCE_DIR}/stack.xml)
configure_file(stack.xml.in ${CMAKE_CURRENT_SOURCE_DIR}/stack.xml @ONLY)
# Must call catkin_export_python() early, to ensure that things like
# rosunit are symlinked into build/bin, and can be found by things like

View File

@ -5,8 +5,16 @@ 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
setup(name='roslib',
version= '1.7.1',
version=version,
packages=['ros', 'roslib', 'rosunit', 'rosmake', 'rosclean', 'roscreate', 'rosboost_cfg'],
package_dir = {'ros':'core/roslib/src/ros',
'roslib':'core/roslib/src/roslib',