p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use condition attributes to specify Python 2 and 3 dependencies (#226)

This commit is contained in:
Dirk Thomas 2019-08-13 15:14:42 -07:00 committed by GitHub
parent c3ce35dc3d
commit 4a71d3a251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 55 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/roslib/package.xml
View File

@ -1,4 +1,8 @@
<package> <?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>roslib</name> <name>roslib</name>
<version>1.14.6</version> <version>1.14.6</version>
<description> <description>
@ -8,20 +12,23 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license> <license>BSD</license>
<url>http://ros.org/wiki/roslib</url> <url type="website">http://wiki.ros.org/roslib</url>
<url type="bugtracker">https://github.com/ros/ros/issues</url>
<url type="repository">https://github.com/ros/ros</url>
<author email="kwc@willowgarage.com">Ken Conley</author> <author email="kwc@willowgarage.com">Ken Conley</author>
<author email="mquigley@cs.stanford.edu">Morgan Quigley</author> <author email="mquigley@cs.stanford.edu">Morgan Quigley</author>
<author email="jfaust@willowgarage.com">Josh Faust</author> <author email="jfaust@willowgarage.com">Josh Faust</author>
<depend>rospack</depend>
<buildtool_depend version_gte="0.6.7">catkin</buildtool_depend> <buildtool_depend version_gte="0.6.7">catkin</buildtool_depend>
<build_depend>boost</build_depend> <build_depend>boost</build_depend>
<build_depend>rospack</build_depend>
<run_depend>catkin</run_depend> <exec_depend>catkin</exec_depend>
<run_depend version_gte="1.0.37">python-rospkg</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 2" version_gte="1.0.37">python-rospkg</exec_depend>
<run_depend>ros_environment</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 3" version_gte="1.0.37">python3-rospkg</exec_depend>
<run_depend>rospack</run_depend> <exec_depend>ros_environment</exec_depend>
<test_depend>rosmake</test_depend> <test_depend>rosmake</test_depend>

13
tools/rosclean/package.xml
View File

@ -1,4 +1,8 @@
<package> <?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosclean</name> <name>rosclean</name>
<version>1.14.6</version> <version>1.14.6</version>
<description> <description>
@ -7,10 +11,13 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license> <license>BSD</license>
<url>http://ros.org/wiki/rosclean</url> <url type="website">http://wiki.ros.org/rosclean</url>
<url type="bugtracker">https://github.com/ros/ros/issues</url>
<url type="repository">https://github.com/ros/ros</url>
<author>Ken Conley</author> <author>Ken Conley</author>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
</package> </package>

15
tools/roscreate/package.xml
View File

@ -1,4 +1,8 @@
<package> <?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>roscreate</name> <name>roscreate</name>
<version>1.14.6</version> <version>1.14.6</version>
<description> <description>
@ -9,12 +13,15 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license> <license>BSD</license>
<url type="website">http://ros.org/wiki/roscreate</url> <url type="website">http://wiki.ros.org/roscreate</url>
<url type="bugtracker">https://github.com/ros/ros/issues</url>
<url type="repository">https://github.com/ros/ros</url>
<author email="kwc@willowgarage.com">Ken Conley</author> <author email="kwc@willowgarage.com">Ken Conley</author>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<run_depend>roslib</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<exec_depend>roslib</exec_depend>
</package> </package>

15
tools/rosmake/package.xml
View File

@ -1,4 +1,8 @@
<package> <?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosmake</name> <name>rosmake</name>
<version>1.14.6</version> <version>1.14.6</version>
<description> <description>
@ -8,13 +12,16 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license> <license>BSD</license>
<url>http://ros.org/wiki/rosmake</url> <url type="website">http://wiki.ros.org/rosmake</url>
<url type="bugtracker">https://github.com/ros/ros/issues</url>
<url type="repository">https://github.com/ros/ros</url>
<author email="tfoote@osrfoundation.org">Tully Foote</author> <author email="tfoote@osrfoundation.org">Tully Foote</author>
<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<run_depend>catkin</run_depend> <exec_depend>catkin</exec_depend>
<run_depend>python-rospkg</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<export> <export>
<rosdoc config="rosdoc.yaml"/> <rosdoc config="rosdoc.yaml"/>

13
tools/rosunit/package.xml
View File

@ -1,4 +1,8 @@
<package> <?xml version="1.0"?>
<?xml-model
href="http://download.ros.org/schema/package_format3.xsd"
schematypens="http://www.w3.org/2001/XMLSchema"?>
<package format="3">
<name>rosunit</name> <name>rosunit</name>
<version>1.14.6</version> <version>1.14.6</version>
<description> <description>
@ -7,15 +11,16 @@
<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer> <maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license> <license>BSD</license>
<url type="website">http://ros.org/wiki/rosunit</url> <url type="website">http://wiki.ros.org/rosunit</url>
<url type="bugtracker">https://github.com/ros/ros/issues</url> <url type="bugtracker">https://github.com/ros/ros/issues</url>
<url type="repository">https://github.com/ros/ros</url> <url type="repository">https://github.com/ros/ros</url>
<author>Ken Conley</author> <author>Ken Conley</author>
<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend> <buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
<run_depend>python-rospkg</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
<run_depend>roslib</run_depend> <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
<exec_depend>roslib</exec_depend>
<export> <export>
<rosdoc config="rosdoc.yaml" /> <rosdoc config="rosdoc.yaml" />