Commit upstream/1.14.6+git20190814.94f467d - ros-ros

+26

-0

LICENSE less more

	0	Redistribution and use in source and binary forms, with or without
	1	modification, are permitted provided that the following conditions
	2	are met:
	3
	4	* Redistributions of source code must retain the above copyright
	5	notice, this list of conditions and the following disclaimer.
	6	* Redistributions in binary form must reproduce the above
	7	copyright notice, this list of conditions and the following
	8	disclaimer in the documentation and/or other materials provided
	9	with the distribution.
	10	* Neither the name of copyright holder nor the names of its
	11	contributors may be used to endorse or promote products derived
	12	from this software without specific prior written permission.
	13
	14	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	15	"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	16	LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
	17	FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
	18	COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
	19	INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
	20	BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
	21	LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
	22	CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
	23	LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
	24	ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
	25	POSSIBILITY OF SUCH DAMAGE.

+14

-7

core/roslib/package.xml less more

0		<package>
	0	<?xml version="1.0"?>
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
1	5	<name>roslib</name>
2	6	<version>1.14.6</version>
3	7	<description>

7	11	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
8	12	<license>BSD</license>
9	13
10		<url>http://ros.org/wiki/roslib</url>
	14	<url type="website">http://wiki.ros.org/roslib</url>
	15	<url type="bugtracker">https://github.com/ros/ros/issues</url>
	16	<url type="repository">https://github.com/ros/ros</url>
11	17	<author email="kwc@willowgarage.com">Ken Conley</author>
12	18	<author email="mquigley@cs.stanford.edu">Morgan Quigley</author>
13	19	<author email="jfaust@willowgarage.com">Josh Faust</author>
14	20
	21	<depend>rospack</depend>
	22
15	23	<buildtool_depend version_gte="0.6.7">catkin</buildtool_depend>
16	24
17	25	<build_depend>boost</build_depend>
18		<build_depend>rospack</build_depend>
19	26
20		<run_depend>catkin</run_depend>
21		<run_depend version_gte="1.0.37">python-rospkg</run_depend>
22		<run_depend>ros_environment</run_depend>
23		<run_depend>rospack</run_depend>
	27	<exec_depend>catkin</exec_depend>
	28	<exec_depend condition="$ROS_PYTHON_VERSION == 2" version_gte="1.0.37">python-rospkg</exec_depend>
	29	<exec_depend condition="$ROS_PYTHON_VERSION == 3" version_gte="1.0.37">python3-rospkg</exec_depend>
	30	<exec_depend>ros_environment</exec_depend>
24	31
25	32	<test_depend>rosmake</test_depend>
26	33

+1

-1

core/roslib/src/roslib/packages.py less more

446	446	for x in to_prune:
447	447	dirs.remove(x)
448	448	else: #UNIX
449		for p, dirs, files in os.walk(d):
	449	for p, dirs, files in os.walk(d, followlinks=True):
450	450	if resource_name in files:
451	451	test_path = os.path.join(p, resource_name)
452	452	if filter_fn is not None:

+2

-2

tools/rosbash/rosbash less more

368	368	else
369	369	path=$(rospack find ${pkgname})
370	370	if [ -d ${path}/msg ]; then
371		echo $(find -L ${path}/msg -maxdepth 1 -mindepth 1 -name .msg ! -regex "./[.][^./]." -print0 \| tr '\000' '\n' \| sed -e "s/.\/$.*$\.msg/${pkgname}\/\1/g")
	371	echo $(find -L ${path}/msg -maxdepth 1 -mindepth 1 -name '.msg' ! -regex "./[.][^./]." -print0 \| tr '\000' '\n' \| sed -e "s/.\/$.*$\.msg/${pkgname}\/\1/g")
372	372	fi
373	373	fi
374	374	}

882	882	path=$(rospack find ${pkgname} 2> /dev/null)
883	883
884	884	if [ $? -eq 0 ] && [ -d ${path}/msg ]; then
885		echo $(find -L ${path}/msg -maxdepth 1 -mindepth 1 -name .msg ! -regex "./[.][^./]." -print0 \| tr '\000' '\n' \| sed -e "s/.\/$.*$\.msg/${pkgname}\/\1/g")
	885	echo $(find -L ${path}/msg -maxdepth 1 -mindepth 1 -name '.msg' ! -regex "./[.][^./]." -print0 \| tr '\000' '\n' \| sed -e "s/.\/$.*$\.msg/${pkgname}\/\1/g")
886	886	fi
887	887	}
888	888

+1

-1

tools/rosbash/scripts/roscd.bat less more

21	21	exit /b 1
22	22	)
23	23
24		for /f "tokens=*" %%g in ('call python %~dp0\findpath.py %1 forceeval') do (
	24	for /f "tokens=*" %%g in ('call python %~dp0\rosfindpath.py %1 forceeval') do (
25	25	set target_path=%%~g
26	26	)
27	27

+1

-1

tools/rosbash/scripts/rosls.bat less more

0	0	@echo off
1	1
2	2	if "%1" equ "--help" goto :usage
3		for /f "tokens=*" %%g in ('call python %~dp0\findpath.py %1 forceeval') do (
	3	for /f "tokens=*" %%g in ('call python %~dp0\rosfindpath.py %1 forceeval') do (
4	4	set target_path=%%~g
5	5	)
6	6

+10

-3

tools/rosclean/package.xml less more

0		<package>
	0	<?xml version="1.0"?>
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
1	5	<name>rosclean</name>
2	6	<version>1.14.6</version>
3	7	<description>

6	10	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
7	11	<license>BSD</license>
8	12
9		<url>http://ros.org/wiki/rosclean</url>
	13	<url type="website">http://wiki.ros.org/rosclean</url>
	14	<url type="bugtracker">https://github.com/ros/ros/issues</url>
	15	<url type="repository">https://github.com/ros/ros</url>
10	16	<author>Ken Conley</author>
11	17
12	18	<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
13	19
14		<run_depend>python-rospkg</run_depend>
	20	<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
	21	<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
15	22	</package>

+4

-1

tools/rosclean/src/rosclean/__init__.py less more

189	189	for d, label in dirs:
190	190	if not args.size:
191	191	print("Purging %s."%label)
192		cmds = [['rm', '-rf', d]]
	192	if platform.system() == 'Windows':
	193	cmds = [['rd', '/s', '/q', d]]
	194	else:
	195	cmds = [['rm', '-rf', d]]
193	196	try:
194	197	if args.y:
195	198	_call(cmds)

+11

-4

tools/roscreate/package.xml less more

0		<package>
	0	<?xml version="1.0"?>
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
1	5	<name>roscreate</name>
2	6	<version>1.14.6</version>
3	7	<description>

8	12	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
9	13	<license>BSD</license>
10	14
11		<url type="website">http://ros.org/wiki/roscreate</url>
	15	<url type="website">http://wiki.ros.org/roscreate</url>
	16	<url type="bugtracker">https://github.com/ros/ros/issues</url>
	17	<url type="repository">https://github.com/ros/ros</url>
12	18
13	19	<author email="kwc@willowgarage.com">Ken Conley</author>
14	20
15	21	<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
16	22
17		<run_depend>python-rospkg</run_depend>
18		<run_depend>roslib</run_depend>
	23	<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
	24	<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
	25	<exec_depend>roslib</exec_depend>
19	26	</package>

+11

-4

tools/rosmake/package.xml less more

0		<package>
	0	<?xml version="1.0"?>
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
1	5	<name>rosmake</name>
2	6	<version>1.14.6</version>
3	7	<description>

7	11	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
8	12	<license>BSD</license>
9	13
10		<url>http://ros.org/wiki/rosmake</url>
	14	<url type="website">http://wiki.ros.org/rosmake</url>
	15	<url type="bugtracker">https://github.com/ros/ros/issues</url>
	16	<url type="repository">https://github.com/ros/ros</url>
11	17	<author email="tfoote@osrfoundation.org">Tully Foote</author>
12	18
13	19	<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
14	20
15		<run_depend>catkin</run_depend>
16		<run_depend>python-rospkg</run_depend>
	21	<exec_depend>catkin</exec_depend>
	22	<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
	23	<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
17	24
18	25	<export>
19	26	<rosdoc config="rosdoc.yaml"/>

+9

-4

tools/rosunit/package.xml less more

0		<package>
	0	<?xml version="1.0"?>
	1	<?xml-model
	2	href="http://download.ros.org/schema/package_format3.xsd"
	3	schematypens="http://www.w3.org/2001/XMLSchema"?>
	4	<package format="3">
1	5	<name>rosunit</name>
2	6	<version>1.14.6</version>
3	7	<description>

6	10	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
7	11	<license>BSD</license>
8	12
9		<url type="website">http://ros.org/wiki/rosunit</url>
	13	<url type="website">http://wiki.ros.org/rosunit</url>
10	14	<url type="bugtracker">https://github.com/ros/ros/issues</url>
11	15	<url type="repository">https://github.com/ros/ros</url>
12	16	<author>Ken Conley</author>
13	17
14	18	<buildtool_depend version_gte="0.5.78">catkin</buildtool_depend>
15	19
16		<run_depend>python-rospkg</run_depend>
17		<run_depend>roslib</run_depend>
	20	<exec_depend condition="$ROS_PYTHON_VERSION == 2">python-rospkg</exec_depend>
	21	<exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rospkg</exec_depend>
	22	<exec_depend>roslib</exec_depend>
18	23
19	24	<export>
20	25	<rosdoc config="rosdoc.yaml" />

+3

-3

tools/rosunit/test/test_junitxml.py less more

103	103	def testGenerateError(self):
104	104	error = junitxml.TestError('error_type', 'error_text')
105	105	error_str = error.xml()
106		self.assertEquals('''<error type="error_type"><![CDATA[
	106	self.assertEquals(b'''<error type="error_type"><![CDATA[
107	107	error_text
108	108	]]></error>''', error_str)
109	109
110	110	def testGenerateFailure(self):
111	111	failure = junitxml.TestFailure('failure_type', 'failure_text')
112	112	failure_str = failure.xml()
113		self.assertEquals('''<failure type="failure_type"><![CDATA[
	113	self.assertEquals(b'''<failure type="failure_type"><![CDATA[
114	114	failure_text
115	115	]]></failure>''', failure_str)
116	116

123	123	testcase.add_error(error)
124	124	testcase.add_failure(failure)
125	125	testcase_str = testcase.xml()
126		self.assertEquals('''<testcase classname="" name="test_case" time="0.0"><failure type="failure_type"><![CDATA[
	126	self.assertEquals(b'''<testcase classname="" name="test_case" time="0.0"><failure type="failure_type"><![CDATA[
127	127	failure_text
128	128	]]></failure><error type="error_type"><![CDATA[
129	129	error_text