Commit 926bb1b88eabecf427f86603314bc1a6181809bc - ros-ros

+6

-0

core/mk/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package mk
2	2	^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

core/mk/package.xml less more

0	0	<package>
1	1	<name>mk</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	A collection of .mk include files for building ROS architectural elements.
5	5	Most package authors should use cmake .mk, which calls CMake for the build of the package.

+7

-0

core/rosbuild/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosbuild
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
	9	* fix dry clean-test-results target (`#71 <https://github.com/ros/ros/issues/71>`_)
3	10
4	11	1.11.5 (2014-08-18)
5	12	-------------------

+1

-1

core/rosbuild/core/rosbuild/public.cmake less more

360	360	# handle lingers in the test results directory), because CMake doesn't
361	361	# seem to be able to do it.
362	362	add_custom_target(rosbuild_clean-test-results
363		if ! rm -rf ${rosbuild_test_results_dir}/${PROJECT_NAME}\; then echo "\"WARNING: failed to remove test-results directory\"\;" fi)
	363	if ! rm -rf ${rosbuild_test_results_dir}/${PROJECT_NAME}\; then echo "\"WARNING: failed to remove test-results directory\";" fi)
364	364	# Make the tests target depend on rosbuild_clean-test-results, which will ensure
365	365	# that test results are deleted before we try to build tests, and thus
366	366	# before we try to run tests.

+1

-1

core/rosbuild/package.xml less more

0	0	<package>
1	1	<name>rosbuild</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	rosbuild contains scripts for managing the CMake-based build system for ROS.
5	5	</description>

+6

-0

core/roslang/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package roslang
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

core/roslang/package.xml less more

0	0	<package>
1	1	<name>roslang</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	roslang is a common package that all <a href="http://www.ros.org/wiki/Client%20Libraries">ROS client libraries</a> depend on.
5	5	This is mainly used to find client libraries (via 'rospack depends-on1 roslang').

+8

-0

core/roslib/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package roslib
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6	* update ROS_DISTRO to jade
	7
	8	1.11.6 (2014-12-22)
	9	-------------------
	10	* consider std_msgs/Header to be a valid header in rosbuild-based messages (`#67 <https://github.com/ros/ros/pull/67>`_)
3	11
4	12	1.11.5 (2014-08-18)
5	13	-------------------

+1

-1

core/roslib/env-hooks/10.ros.bat.em less more

4	4	rem Need the delims= line here to ensure that it reads with eol delimiters, not space.
5	5	for /f "delims=" %%i in ('%COMMAND%') do set PATH=%%i
6	6
7		set ROS_DISTRO=indigo
	7	set ROS_DISTRO=jade
8	8
9	9	REM python function to generate ROS package path based on all parent workspaces (prepends the separator if necessary)
10	10	REM do not use EnableDelayedExpansion here, it messes with the != symbols

+2

-2

core/roslib/env-hooks/10.ros.sh.em less more

2	2	# scrub old ROS bin dirs, to avoid accidentally finding the wrong executables
3	3	export PATH="`@(PYTHON_EXECUTABLE) -c \"import os; print(os.pathsep.join([x for x in \\\"$PATH\\\".split(os.pathsep) if not any([d for d in ['cturtle', 'diamondback', 'electric', 'fuerte'] if d in x])]))\"`"
4	4
5		if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "indigo" ]; then
	5	if [ -n "$ROS_DISTRO" -a "$ROS_DISTRO" != "jade" ]; then
6	6	echo "ROS_DISTRO was set to '$ROS_DISTRO' before. Please make sure that the environment does not mix paths from different distributions."
7	7	fi
8		export ROS_DISTRO=indigo
	8	export ROS_DISTRO=jade
9	9
10	10	# python function to generate ROS package path based on all workspaces
11	11	PYTHON_CODE_BUILD_ROS_PACKAGE_PATH=$(cat <<EOF

+1

-1

core/roslib/package.xml less more

0	0	<package>
1	1	<name>roslib</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	Base dependencies and support libraries for ROS.
5	5	roslib contains many of the common data structures and tools that are shared across ROS client library implementations.

+1

-1

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

300	300	assert len(self.types) == len(self.names), "len(%s) != len(%s)"%(self.types, self.names)
301	301	#Header.msg support
302	302	if (len(self.types)):
303		self.header_present = self.types[0] == HEADER and self.names[0] == 'header'
	303	self.header_present = is_header_type(self.types[0]) and self.names[0] == 'header'
304	304	else:
305	305	self.header_present = False
306	306	self.text = text

+1

-1

ros/package.xml less more

0	0	<package>
1	1	<name>ros</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>ROS packaging system</description>
4	4	<maintainer email="dthomas@osrfoundation.org">Dirk Thomas</maintainer>
5	5	<license>BSD</license>

+8

-0

tools/rosbash/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosbash
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
	9	* match behaviour of 'roscd' in zsh with bash (`#73 <https://github.com/ros/ros/pull/73>`_)
	10	* improve rosbag zsh tab completion for bag files (`#70 <https://github.com/ros/ros/issues/70>`_)
3	11
4	12	1.11.5 (2014-08-18)
5	13	-------------------

+1

-1

tools/rosbash/package.xml less more

0	0	<package>
1	1	<name>rosbash</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	Assorted shell commands for using ros with bash.
5	5	</description>

+103

-88

tools/rosbash/roszsh less more

74	74	fi
75	75
76	76	echo $1 \| grep -G '.\+/.*' > /dev/null
77		if [[ $? == 0 ]]; then
78		rosname=${1%%/*}
	77	if [[ $? == 0 ]]; then
	78	rosname=${1%%/*}
79	79	reldir=/${1#*/}
80		last=${reldir##*/}
	80	last=${reldir##*/}
81	81	reldir=${reldir%/*}/
82	82	else
83	83	rosname=$1
84	84	if [[ -z $2 \|\| $2 != "forceeval" ]]; then
85		rosvals=(${rosname})
86		return 1
	85	rosvals=(${rosname})
	86	return 1
87	87	fi
88	88	fi
89	89

101	101	rosstackdir=`export ROS_CACHE_TIMEOUT=-1.0 && rosstack find $rosname 2> /dev/null`
102	102	rosstack_result=$?
103	103	if [[ $rospack_result == 0 ]]; then
104		rosdir=$rospackdir
	104	rosdir=$rospackdir
105	105	elif [[ $rosstack_result == 0 ]]; then
106		rosdir=$rosstackdir
	106	rosdir=$rosstackdir
107	107	else
108	108	rosvals=(${rosname})
109	109	return 1

114	114	}
115	115
116	116	function rospython {
117		if [[ $1 = "--help" ]]; then
118		echo -e "usage: rospython [package] \n\nRun python loading package manifest first."
119		return 0
120		fi
121		if [[ -z $1 ]]; then
122		if [[ -f ./manifest.xml ]]; then
123		pkgname=`basename \`pwd\``
124		python -i -c "import roslib; roslib.load_manifest('$pkgname')"
125		else
126		python
127		fi
128		else
129		python -i -c "import roslib; roslib.load_manifest('$1')"
130		fi
	117	if [[ $1 = "--help" ]]; then
	118	echo -e "usage: rospython [package] \n\nRun python loading package manifest first."
	119	return 0
	120	fi
	121	if [[ -z $1 ]]; then
	122	if [[ -f ./manifest.xml ]]; then
	123	pkgname=`basename \`pwd\``
	124	python -i -c "import roslib; roslib.load_manifest('$pkgname')"
	125	else
	126	python
	127	fi
	128	else
	129	python -i -c "import roslib; roslib.load_manifest('$1')"
	130	fi
131	131	}
132	132
133	133	function roscd {
134		local rosvals
	134	local rosvals
135	135	if [[ $1 = "--help" ]] \| [[ $# -gt 1 ]]; then
136	136	echo -e "usage: roscd package\n\nJump to target package."
137	137	return 0
138	138	fi
139	139	if [ -z $1 ]; then
140		if [ -z $ROS_WORKSPACE ]; then
141		echo -e "No ROS_WORKSPACE set. Please set ROS_WORKSPACE to use roscd with no arguments."
	140	if [ ! -z $ROS_WORKSPACE ]; then
	141	cd ${ROS_WORKSPACE}
	142	return 0
	143	fi
	144	if [ ! -z $CMAKE_PREFIX_PATH ]; then
	145	workspaces=("${(s/:/)CMAKE_PREFIX_PATH}")
	146	for ws in "${workspaces[@]}"; do
	147	if [ -f $ws/.catkin ]; then
	148	cd ${ws}
	149	return 0
	150	fi
	151	done
	152	fi
	153	echo -e "Neither ROS_WORKSPACE is set nor a catkin workspace is listed in CMAKE_PREFIX_PATH. Please set ROS_WORKSPACE or source a catkin workspace to use roscd with no arguments."
142	154	return 1
143		fi
144		cd ${ROS_WORKSPACE}
145		return 0
146	155	fi
147	156
148	157	_ros_decode_path $1 forceeval
149	158	if [ $? != 0 ]; then
150		echo "roscd: No such package '$1'"
151		return 1
	159	echo "roscd: No such package '$1'"
	160	return 1
152	161	elif [ -z ${rosvals[1]} ]; then
153		if [ -z $ROS_WORKSPACE ]; then
154		echo -e "No ROS_WORKSPACE set. Please set ROS_WORKSPACE to use roscd with no arguments."
155		return 1
156		fi
157		cd ${ROS_WORKSPACE}
158		return 0
159		else
160		cd ${rosvals[2]}${rosvals[3]}${rosvals[4]}
161		return 0
	162	if [ -z $ROS_WORKSPACE ]; then
	163	echo -e "No ROS_WORKSPACE set. Please set ROS_WORKSPACE to use roscd with no arguments."
	164	return 1
	165	fi
	166	cd ${ROS_WORKSPACE}
	167	return 0
	168	else
	169	cd ${rosvals[2]}${rosvals[3]}${rosvals[4]}
	170	return 0
162	171	fi
163	172	}
164	173
165	174	function _is_integer {
166		[ "$1" -eq "$1" ] > /dev/null 2>&1
	175	[ "$1" -eq "$1" ] > /dev/null 2>&1
167	176	return $?
168	177	}
169	178

172	181	echo -e "usage: rosd\n\nDisplays the list of currently remembered directories with indexes."
173	182	return 0
174	183	fi
175		let count=0;
	184	let count=0;
176	185	for items in `dirs`;
177	186	do
178	187	echo $count $items;

260	269	stack_opts=`export ROS_CACHE_TIMEOUT=-1.0 && rosstack list-names`
261	270	IFS=$'\n'
262	271	reply=(${=opts} ${=stack_opts})
263		unset IFS
	272	unset IFS
264	273	}
265	274
266	275	function _roscomplete_rosmake {

284	293	reply=(${=opts} ${=stack_opts})
285	294	unset IFS
286	295	else
287		if [ -e ${rosvals[2]}${rosvals[3]} ]; then
288		sedcmd="s:^${rosvals[2]}:${rosvals[1]}:"g
289		#echo
290		#echo $sedcmd
291		#echo
292		opts=`find ${rosvals[2]}${rosvals[3]} -maxdepth 1 -mindepth 1 -type d ! -regex "./[.]." -print0 \| tr '\000' '\n' \| sed -e "$sedcmd"`
293		#echo $opts
	296	if [ -e ${rosvals[2]}${rosvals[3]} ]; then
	297	sedcmd="s:^${rosvals[2]}:${rosvals[1]}:"g
	298	opts=`find ${rosvals[2]}${rosvals[3]} -maxdepth 1 -mindepth 1 -type d ! -regex "./[.]." -print0 \| tr '\000' '\n' \| sed -e "$sedcmd"`
294	299	else
295		opts=''
	300	opts=''
296	301	fi
297	302	IFS=$'\n'
298	303	reply=(${=opts})

303	308	function _roscomplete_search_dir {
304	309	local words arg opts pkg pkgdir pkgdir_result stack_result catkin_package_libexec_dir
305	310	reply=()
306		words=(${=BUFFER})
	311	words=(${=BUFFER})
307	312	if [[ $BUFFER[-1] == ' ' ]]
308	313	then
309	314	pkg=${words[-1]}

386	391	;;
387	392	esac
388	393	reply=(${=opts})
	394	else
	395	case ${=${(s: :)words}[2]} in
	396	record)
	397	opts=$(rostopic list 2>/dev/null)
	398	if [ -z "$opts" ]; then
	399	reply="" #Prevent execution of next rule
	400	return
	401	fi
	402	reply=(${=opts})
	403	;;
	404	esac
389	405	fi
390	406	fi
391	407

499	515	esac
500	516	reply=(${=opts})
501	517	else
502		case ${=${(s: :)words}[2]} in
503		bw\|echo\|hz\|list\|type\|info)
504		if [[ ${=${(s: :)words}[$(( ${CURRENT} -1 ))]} == "-b" ]]; then
505		opts=`find . -maxdepth 1 -type f -not -name "." -not -name "[~#]" \| sed 's!.*/!!'`
506		reply=(${=opts})
507		else
508		opts=`rostopic list 2> /dev/null`
509		reply=(${=opts})
510		fi
511		;;
512		find)
513		opts=`_msg_opts ${=${(s: :)words[-1]}}`
514		reply=(${=opts})
515		;;
516		pub)
517		if [[ ${CURRENT} == 3 ]]; then
518		opts=`rostopic list 2> /dev/null`
519		reply=(${=opts})
520		elif [[ ${CURRENT} == 4 ]]; then
521		if [[ ${=${(s: :)words}[$(( ${CURRENT} ))]} =~ / ]]; then
522		word=(${=words})
523		type=`rostopic info ${word[3]} 2> /dev/null`
524		opts=${=${type[(w)2]}}
525		else
526		word=(${=words})
527		type=`rostopic info ${word[3]} 2> /dev/null`
528		opts=${=${type[(w)2]}}
529		fi
530		reply=(${=opts})
531		elif [[ ${CURRENT} == 5 ]]; then
532		w=(${=words})
533		opts=`rosmsg-proto msg 2> /dev/null -s ${=${w[-1]}}`
534		reply=(${opts})
535		fi
536		;;
537		esac
	518	case ${=${(s: :)words}[2]} in
	519	bw\|echo\|hz\|list\|type\|info)
	520	if [[ ${=${(s: :)words}[$(( ${CURRENT} -1 ))]} == "-b" ]]; then
	521	opts=`find . -maxdepth 1 -type f -not -name "." -not -name "[~#]" \| sed 's!.*/!!'`
	522	reply=(${=opts})
	523	else
	524	opts=`rostopic list 2> /dev/null`
	525	reply=(${=opts})
	526	fi
	527	;;
	528	find)
	529	opts=`_msg_opts ${=${(s: :)words[-1]}}`
	530	reply=(${=opts})
	531	;;
	532	pub)
	533	if [[ ${CURRENT} == 3 ]]; then
	534	opts=`rostopic list 2> /dev/null`
	535	reply=(${=opts})
	536	elif [[ ${CURRENT} == 4 ]]; then
	537	if [[ ${=${(s: :)words}[$(( ${CURRENT} ))]} =~ / ]]; then
	538	word=(${=words})
	539	type=`rostopic info ${word[3]} 2> /dev/null`
	540	opts=${=${type[(w)2]}}
	541	else
	542	word=(${=words})
	543	type=`rostopic info ${word[3]} 2> /dev/null`
	544	opts=${=${type[(w)2]}}
	545	fi
	546	reply=(${=opts})
	547	elif [[ ${CURRENT} == 5 ]]; then
	548	w=(${=words})
	549	opts=`rosmsg-proto msg 2> /dev/null -s ${=${w[-1]}}`
	550	reply=(${opts})
	551	fi
	552	;;
	553	esac
538	554	fi
539	555	fi
540	556	}

616	632	local opts
617	633	reply=()
618	634
619
620	635	if [[ ${CURRENT} == 2 ]]; then
621	636	opts="show list md5 package packages"
622	637	reply=(${=opts})

720	735	compctl -/g '*.(launch\|test)' -x 'p[1]' -K "_roscomplete" -tx - 'p[2]' -K _roscomplete_launchfile -- + -x 'S[--]' -k "(--files --args --nodes --find-node --child --local --screen --server_uri --run_id --wait --port --core --pid --dump-params)" -- "roslaunch"
721	736	compctl -/g '*.(launch\|test)' -x 'p[1]' -K "_roscomplete" -tx - 'p[2]' -K _roscomplete_launchfile -- + -x 'S[--]' -k "(--bare --bare-limit --bare-name --pkgdir --package)" -- "rostest"
722	737	compctl -K "_roscomplete_rospack" "rospack"
723		compctl -K "_roscomplete_rosbag" "rosbag"
	738	compctl -K "_roscomplete_rosbag" + -g ".bag (/)" "rosbag"
724	739	compctl -K "_roscomplete_rosnode" "rosnode"
725	740	compctl -K "_roscomplete_rosparam" "rosparam"
726	741	compctl -x 'p[0,2]' -K "_roscomplete_rostopic" - 'n[1,/] p[3]' -K "_roscomplete_rostopic" - 'p[3]' -S ' ' -K "_roscomplete_rostopic" - 'p[4]' -Q -K "_roscomplete_rostopic" -- "rostopic"

+6

-0

tools/rosboost_cfg/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosboost_cfg
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

tools/rosboost_cfg/package.xml less more

0	0	<package>
1	1	<name>rosboost_cfg</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system
5	5	</description>

+6

-0

tools/rosclean/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosclean
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

tools/rosclean/package.xml less more

0	0	<package>
1	1	<name>rosclean</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	rosclean: cleanup filesystem resources (e.g. log files).
5	5	</description>

+6

-0

tools/roscreate/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package roscreate
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

tools/roscreate/package.xml less more

0	0	<package>
1	1	<name>roscreate</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	roscreate contains a tool that assists in the creation of ROS filesystem resources.
5	5	It provides: <tt>roscreate-pkg</tt>, which creates a new package directory,

+6

-0

tools/rosmake/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosmake
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
3	9
4	10	1.11.5 (2014-08-18)
5	11	-------------------

+1

-1

tools/rosmake/package.xml less more

0	0	<package>
1	1	<name>rosmake</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	rosmake is a ros dependency aware build tool which can be used to
5	5	build all dependencies in the correct order.

+7

-0

tools/rosunit/CHANGELOG.rst less more

0	0	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
1	1	Changelog for package rosunit
2	2	^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
	3
	4	1.12.0 (2014-12-26)
	5	-------------------
	6
	7	1.11.6 (2014-12-22)
	8	-------------------
	9	* fix OSError handling (`#69 <https://github.com/ros/ros/pull/69>`_, regression since 1.11.1)
3	10
4	11	1.11.5 (2014-08-18)
5	12	-------------------

+1

-1

tools/rosunit/package.xml less more

0	0	<package>
1	1	<name>rosunit</name>
2		<version>1.11.5</version>
	2	<version>1.12.0</version>
3	3	<description>
4	4	Unit-testing package for ROS. This is a lower-level library for rostest and handles unit tests, whereas rostest handles integration tests.
5	5	</description>

+1

-1

tools/rosunit/src/rosunit/baretest.py less more

258	258	if e.errno == 13:
259	259	raise RLException("unable to create directory for log file [%s].\nPlease check permissions."%log_dir)
260	260	else:
261		raise RLException("unable to create directory for log file [%s]: %s"%(log_dir, e.msg))
	261	raise RLException("unable to create directory for log file [%s]: %s"%(log_dir, e.strerror))
262	262	# #973: save log dir for error messages
263	263	self.log_dir = log_dir
264	264