update setup() to use generate_distutils_setup

core/roslib/setup.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['ros', 'roslib']
+    packages=['ros', 'roslib'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['requires'] = ['rospkg']
+    requires=['rospkg']
+)
 
 setup(**d)

tools/rosboost_cfg/setup.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['rosboost_cfg']
+    packages=['rosboost_cfg'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['scripts'] = ['scripts/rosboost-cfg']
+    scripts=['scripts/rosboost-cfg']
+)
 
 setup(**d)

tools/rosclean/setup.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['rosclean']
+    packages=['rosclean'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['scripts'] = ['scripts/rosclean']
+    scripts=['scripts/rosclean'],
-d['requires'] = ['rospkg']
+    requires=['rospkg']
+)
 
 setup(**d)

tools/roscreate/setup.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['roscreate']
+    packages=['roscreate'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['scripts'] = ['scripts/roscreate-pkg']
+    scripts=['scripts/roscreate-pkg'],
-d['requires'] = ['roslib', 'rospkg']
+    requires=['roslib', 'rospkg']
+)
 
 setup(**d)

tools/rosmake/setup.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['rosmake']
+    packages=['rosmake'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['scripts'] = ['scripts/rosmake']
+    scripts=['scripts/rosmake'],
-d['requires'] = ['rospkg']
+    requires=['rospkg']
+)
 
 setup(**d)

tools/rosunit/setup.py

@@ -1,12 +1,13 @@
 #!/usr/bin/env python
 
 from distutils.core import setup
-from catkin_pkg.package import parse_package_for_distutils
+from catkin_pkg.python_setup import generate_distutils_setup
 
-d = parse_package_for_distutils()
+d = generate_distutils_setup(
-d['packages'] = ['rosunit']
+    packages=['rosunit'],
-d['package_dir'] = {'': 'src'}
+    package_dir={'': 'src'},
-d['scripts'] = ['scripts/rosunit']
+    scripts=['scripts/rosunit'],
-d['requires'] = ['rospkg']
+    requires=['rospkg']
+)
 
 setup(**d)