Skip to content

Commit 5f1ad26

Browse files
committed
convert to package format3 and use setuptools
1 parent 02e7cdf commit 5f1ad26

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

package.xml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
<package>
1+
<?xml version="1.0"?>
2+
<?xml-model
3+
href="http://download.ros.org/schema/package_format3.xsd"
4+
schematypens="http://www.w3.org/2001/XMLSchema"?>
5+
<package format="3">
26
<name>rosjava_build_tools</name>
37
<version>0.3.3</version>
48
<description>
@@ -12,10 +16,10 @@
1216
<author>Daniel Stonier</author>
1317

1418
<buildtool_depend>catkin</buildtool_depend>
19+
<buildtool_depend condition="$ROS_PYTHON_VERSION == 2">python-setuptools</buildtool_depend>
20+
<buildtool_depend condition="$ROS_PYTHON_VERSION == 3">python3-setuptools</buildtool_depend>
1521

16-
<build_depend>java</build_depend>
17-
<build_depend>ant</build_depend>
18-
<run_depend>java</run_depend>
19-
<run_depend>ant</run_depend>
20-
<run_depend>catkin</run_depend>
22+
<depend>ant</depend>
23+
<depend>java</depend>
24+
<exec_depend>catkin</exec_depend>
2125
</package>

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22

3-
from distutils.core import setup
3+
from setuptools import setup
44
from catkin_pkg.python_setup import generate_distutils_setup
55

66
d = generate_distutils_setup(

0 commit comments

Comments
 (0)