[ros] 01/01: Imported Upstream version 1.12.1
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Thu Apr 23 21:29:23 UTC 2015
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to annotated tag upstream/1.12.1
in repository ros.
commit cad291f29bf5a12045e6f635188d6c39c4d0c2af
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Thu Apr 23 23:01:13 2015 +0200
Imported Upstream version 1.12.1
---
core/mk/CHANGELOG.rst | 3 +
core/mk/package.xml | 2 +-
core/rosbuild/CHANGELOG.rst | 3 +
core/rosbuild/package.xml | 2 +-
core/roslang/CHANGELOG.rst | 3 +
core/roslang/package.xml | 2 +-
core/roslib/CHANGELOG.rst | 4 +
core/roslib/package.xml | 2 +-
core/roslib/src/roslib/rosenv.py | 17 +-
ros/package.xml | 2 +-
tools/rosbash/CHANGELOG.rst | 5 +
tools/rosbash/CMakeLists.txt | 4 +-
tools/rosbash/env-hooks/15.rosbash.fish.em | 10 +
tools/rosbash/package.xml | 2 +-
tools/rosbash/rosbash | 16 +-
tools/rosbash/rosfish | 357 +++++++++++++++++++++++++++++
tools/rosboost_cfg/CHANGELOG.rst | 3 +
tools/rosboost_cfg/package.xml | 2 +-
tools/rosclean/CHANGELOG.rst | 3 +
tools/rosclean/package.xml | 2 +-
tools/roscreate/CHANGELOG.rst | 3 +
tools/roscreate/package.xml | 2 +-
tools/rosmake/CHANGELOG.rst | 3 +
tools/rosmake/package.xml | 2 +-
tools/rosunit/CHANGELOG.rst | 3 +
tools/rosunit/package.xml | 2 +-
26 files changed, 432 insertions(+), 27 deletions(-)
diff --git a/core/mk/CHANGELOG.rst b/core/mk/CHANGELOG.rst
index 113fab4..9f47061 100644
--- a/core/mk/CHANGELOG.rst
+++ b/core/mk/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package mk
^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/core/mk/package.xml b/core/mk/package.xml
index e66bffb..00bd188 100644
--- a/core/mk/package.xml
+++ b/core/mk/package.xml
@@ -1,6 +1,6 @@
<package>
<name>mk</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
A collection of .mk include files for building ROS architectural elements.
Most package authors should use cmake .mk, which calls CMake for the build of the package.
diff --git a/core/rosbuild/CHANGELOG.rst b/core/rosbuild/CHANGELOG.rst
index b975415..714d6a1 100644
--- a/core/rosbuild/CHANGELOG.rst
+++ b/core/rosbuild/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosbuild
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/core/rosbuild/package.xml b/core/rosbuild/package.xml
index d5c4262..541bf59 100644
--- a/core/rosbuild/package.xml
+++ b/core/rosbuild/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosbuild</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
rosbuild contains scripts for managing the CMake-based build system for ROS.
</description>
diff --git a/core/roslang/CHANGELOG.rst b/core/roslang/CHANGELOG.rst
index 4f33631..6ece305 100644
--- a/core/roslang/CHANGELOG.rst
+++ b/core/roslang/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roslang
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/core/roslang/package.xml b/core/roslang/package.xml
index 30a9c34..922d41d 100644
--- a/core/roslang/package.xml
+++ b/core/roslang/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roslang</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
roslang is a common package that all <a href="http://www.ros.org/wiki/Client%20Libraries">ROS client libraries</a> depend on.
This is mainly used to find client libraries (via 'rospack depends-on1 roslang').
diff --git a/core/roslib/CHANGELOG.rst b/core/roslib/CHANGELOG.rst
index 67326d2..3d93e55 100644
--- a/core/roslib/CHANGELOG.rst
+++ b/core/roslib/CHANGELOG.rst
@@ -2,6 +2,10 @@
Changelog for package roslib
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+* remove usage of CATKIN_TEST_RESULTS_DIR environment variable (`#80 <https://github.com/ros/ros/pull/80>`_)
+
1.12.0 (2014-12-26)
-------------------
* update ROS_DISTRO to jade
diff --git a/core/roslib/package.xml b/core/roslib/package.xml
index c2fdc95..bcec23e 100644
--- a/core/roslib/package.xml
+++ b/core/roslib/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roslib</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
Base dependencies and support libraries for ROS.
roslib contains many of the common data structures and tools that are shared across ROS client library implementations.
diff --git a/core/roslib/src/roslib/rosenv.py b/core/roslib/src/roslib/rosenv.py
index 87d15d2..422de93 100644
--- a/core/roslib/src/roslib/rosenv.py
+++ b/core/roslib/src/roslib/rosenv.py
@@ -59,8 +59,7 @@ ROS_HOSTNAME ="ROS_HOSTNAME"
ROS_NAMESPACE ="ROS_NAMESPACE"
## directory in which log files are written
ROS_LOG_DIR ="ROS_LOG_DIR"
-## directory in which test result files are written
-CATKIN_TEST_RESULTS_DIR = "CATKIN_TEST_RESULTS_DIR"
+
class ROSEnvException(Exception):
"""Base class of roslib.rosenv errors."""
@@ -189,23 +188,15 @@ def get_log_dir(env=None):
def get_test_results_dir(env=None):
"""
Get directory to use for writing test result files. There are multiple
- possible locations for this. The CATKIN_TEST_RESULTS_DIR environment variable
- has priority. If that is set, CATKIN_TEST_RESULTS_DIR is returned.
- If CATKIN_TEST_RESULTS_DIR is not set, then ROS_HOME/test_results is used. If
- ROS_HOME is not set, $HOME/.ros/test_results is used.
+ possible locations for this. If ROS_HOME is set ROS_HOME/test_results
+ is used. Otherwise $HOME/.ros/test_results is used.
@param env: environment dictionary (defaults to os.environ)
@type env: dict
@return: path to use use for log file directory
@rtype: str
"""
- if env is None:
- env = os.environ
-
- if CATKIN_TEST_RESULTS_DIR in env:
- return env[CATKIN_TEST_RESULTS_DIR]
- else:
- return os.path.join(get_ros_home(env), 'test_results')
+ return os.path.join(get_ros_home(env), 'test_results')
# this is a copy of the roslogging utility. it's been moved here as it is a common
# routine for programs using accessing ROS directories
diff --git a/ros/package.xml b/ros/package.xml
index 4dcaece..c859bc5 100644
--- a/ros/package.xml
+++ b/ros/package.xml
@@ -1,6 +1,6 @@
<package>
<name>ros</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>ROS packaging system</description>
<maintainer email="dthomas at osrfoundation.org">Dirk Thomas</maintainer>
<license>BSD</license>
diff --git a/tools/rosbash/CHANGELOG.rst b/tools/rosbash/CHANGELOG.rst
index 62aa6aa..6eeca90 100644
--- a/tools/rosbash/CHANGELOG.rst
+++ b/tools/rosbash/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package rosbash
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+* add support for fish shell (`#77 <https://github.com/ros/ros/pull/77>`_)
+* enable roslaunch args completion in rosbash
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/rosbash/CMakeLists.txt b/tools/rosbash/CMakeLists.txt
index cfb2b8c..03703b2 100644
--- a/tools/rosbash/CMakeLists.txt
+++ b/tools/rosbash/CMakeLists.txt
@@ -3,7 +3,7 @@ project(rosbash)
find_package(catkin)
catkin_package()
-install(FILES rosbash rostcsh roszsh
+install(FILES rosbash rosfish rostcsh roszsh
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
install(PROGRAMS scripts/rosrun
DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION})
@@ -14,4 +14,4 @@ configure_file(${catkin_EXTRAS_DIR}/templates/script.bash.in
${CATKIN_DEVEL_PREFIX}/bin/rosrun
@ONLY)
-catkin_add_env_hooks(15.rosbash SHELLS bash tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
+catkin_add_env_hooks(15.rosbash SHELLS bash fish tcsh zsh DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/env-hooks)
diff --git a/tools/rosbash/env-hooks/15.rosbash.fish.em b/tools/rosbash/env-hooks/15.rosbash.fish.em
new file mode 100644
index 0000000..88b30dc
--- /dev/null
+++ b/tools/rosbash/env-hooks/15.rosbash.fish.em
@@ -0,0 +1,10 @@
+# generated from rosbash/env-hooks/15.rosbash.fish.em
+
+@[if DEVELSPACE]@
+. "@(CMAKE_CURRENT_SOURCE_DIR)/rosfish"
+@[else]@
+if [ -z "$CATKIN_ENV_HOOK_WORKSPACE" ]; then
+ CATKIN_ENV_HOOK_WORKSPACE="@(CMAKE_INSTALL_PREFIX)"
+fi
+. "$CATKIN_ENV_HOOK_WORKSPACE/share/rosbash/rosfish"
+@[end if]@
diff --git a/tools/rosbash/package.xml b/tools/rosbash/package.xml
index 0dc0dad..22c6672 100644
--- a/tools/rosbash/package.xml
+++ b/tools/rosbash/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosbash</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
Assorted shell commands for using ros with bash.
</description>
diff --git a/tools/rosbash/rosbash b/tools/rosbash/rosbash
index 643f8fa..57847d1 100644
--- a/tools/rosbash/rosbash
+++ b/tools/rosbash/rosbash
@@ -557,13 +557,27 @@ function _roscomplete_launch {
arg="${COMP_WORDS[COMP_CWORD]}"
COMPREPLY=()
if [[ ${arg} =~ \-\-.* ]]; then
- COMPREPLY=(${COMPREPLY[@]} $(compgen -W "--files --args --nodes --find-node --child --local --screen --server_uri --run_id --wait --port --core --pid --dump-params" -- ${arg}))
+ COMPREPLY=(${COMPREPLY[@]} $(compgen -W "--files --args --nodes --find-node --child --local --screen --server_uri --run_id --wait --port --core --pid --dump-params --skip-log-check --ros-args" -- ${arg}))
else
_roscomplete_search_dir "( -type f -regex .*\.launch$ -o -type f -regex .*\.test$ )"
if [[ $COMP_CWORD == 1 ]]; then
COMPREPLY=($(compgen -o plusdirs -f -X "!*.launch" -- ${arg}) ${COMPREPLY[@]} $(compgen -o plusdirs -f -X "!*.test" -- ${arg}) ${COMPREPLY[@]})
fi
+ # complete roslaunch arguments for a launch file
+ if [[ ${#COMP_WORDS[@]} -ge 2 ]]; then
+ ROSLAUNCH_COMPLETE=$(which roslaunch-complete)
+ if [[ -x ${ROSLAUNCH_COMPLETE} ]]; then
+ # Call roslaunch-complete instead of roslaunch to get arg completion
+ _roslaunch_args=$(${ROSLAUNCH_COMPLETE} ${COMP_WORDS[@]:1:2} 2> /dev/null)
+ # roslaunch-complete should be very silent about
+ # errors and return 0 if it produced usable completion.
+ if [[ $? == 0 ]]; then
+ COMPREPLY=($(compgen -W "${_roslaunch_args}" -- "${arg}") ${COMPREPLY[@]})
+ # FIXME maybe leave ${COMPREPLY[@]} out if we completed successfully.
+ fi
+ fi
+ fi
fi
}
diff --git a/tools/rosbash/rosfish b/tools/rosbash/rosfish
new file mode 100644
index 0000000..18b0983
--- /dev/null
+++ b/tools/rosbash/rosfish
@@ -0,0 +1,357 @@
+
+function _rossed
+ if test (uname) = "Darwin" -o (uname) = "FreeBSD"
+ sed -E $argv
+ else
+ sed -r $argv
+ end
+end
+
+function _rosfind
+ if test (uname) = "Darwin" -o (uanme) = "FreeBSD"
+ # BSD find needs -E for extended regexp
+ find -E $argv
+ else
+ find $argv
+ end
+end
+
+# _ros_location_find
+# Takes a name of a ros location and returns it's path
+function _ros_location_find
+ set -l homedir (echo $HOME | sed -e "s/\//\t\//g" -e "s/\t/\\\/g")
+ set -l ROS_LOCATION_KEYS_ARR (echo $ROS_LOCATIONS | _rossed -e 's/([^:=]*)=([^:=]*)(:*[^=])*(:|$)/\1 /g')
+ set -l ROS_LOCATIONS_ARR (echo $ROS_LOCATIONS | _rossed -e 's/([^:=]*)=([^:=]*)(:*[^=])*(:|$)/\2 /g' -e "s/~/{$homedir}/g")
+ for key in $ROS_LOCATION_KEYS_ARR
+ if test $argv[1] = $key
+ echo $key
+ return 0
+ end
+ end
+
+ if test $argv[1] = log
+ echo (roslaunch-logs)
+ return 0
+ else if test $argv[1] = test_results
+ echo (rosrun rosunit test_results_dir.py)
+ return 0
+ end
+
+ set -l loc (set -x ROS_CACHE_TIMEOUT -1.0; rospack find $argv[1] 2> /dev/null)
+ if test $status != 0
+ set loc (set -x ROS_CACHE_TIMEOUT -1.0; rosstack find $argv[1] 2> /dev/null)
+ if test $status != 0
+ return 1
+ end
+ echo $loc
+ return 0
+ end
+ echo $loc
+ return 0
+end
+
+function _ros_list_locations
+ set -l ROS_LOCATION_KEYS (echo $ROS_LOCATIONS | _rossed -e 's/([^:=]*)=([^:=]*)(:*[^=])*(:|$)/\1 /g')
+ set -l packages (set -x ROS_CACHE_TIMEOUT -1.0; rospack list-names)
+ set -l stacks (set -x ROS_CACHE_TIMEOUT -1.0; rosstack list-names)
+ echo $packages $stacks log test_results $ROS_LOCATION_KEYS | tr ' ' '\n'
+ return 0
+end
+
+function _ros_package_find
+ set -l loc (set -x ROS_CACHE_TIMEOUT -1.0; rospack find $1 2> /dev/null)
+ if test $status != 0
+ return 1
+ end
+ echo $loc
+ return 0
+end
+
+function _ros_list_packages
+ set -l packages (set -x ROS_CACHE_TIMEOUT -1.0; rospack list-names)
+ echo $packages | tr ' ' '\n'
+ return 0
+end
+
+function _ros_list_stacks
+ set -l stacks (set -x ROS_CACHE_TIMEOUT -1.0; rosstack list-names)
+ echo $stacks | tr ' ' '\n'
+ return 0
+end
+
+# takes as argument either just a package-path or just a pkgname
+# returns 0 for no argument or if package (+ path) exist, 1 else
+# on success with arguments returns [name, abspath, basepath, remainder]
+function _ros_decode_path
+ if test -z $argv[1]
+ return 0
+ end
+
+ set -l rosname (echo $argv[1] | sed -n 's/\([^/]\+\).*/\1/p')
+
+ if not test -z $rosname
+ set remainder (echo $argv[1] | sed -n "s/$rosname"'\(.*\)/\1/p')
+ else
+ set rosname $argv[1]
+ if test (count $argv) != "2" -o $argv[2] != "forceeval"
+ echo $rosname
+ return 1
+ end
+ end
+
+ set -l rosdir (_ros_location_find $rosname)
+ if test $status != "0"
+ echo $rosname
+ return 1
+ end
+ set -l reldir (echo $remainder | sed -n 's/\(.*\/\)[^/]*/\1/p')
+ set -l last (echo $remainder | sed -n 's/.*\/\([^/]*\)/\1/p')
+
+ if test -z $reldir
+ set reldir /
+ end
+
+ set rosvals {$rosname} {$rosdir} {$reldir} {$last}
+ echo {$rosdir}{$remainder}
+ return 0
+end
+
+function rospython
+ if test -z $argv
+ python -i -c "import roslib; roslib.load_manifest('$1')"
+ return 0
+ end
+ if test (count $argv) = 1
+ if test $argv[1] = "--help"
+ echo -e "usage: rospython [package] \n\nRun python loading package manifest first."
+ return 0
+ end
+ end
+ if test -f ./manifest.xml
+ set pkgname (basename (pwd))
+ python -i -c "import roslib; roslib.load_manifest($pkgname)"
+ else
+ python
+ end
+end
+
+function roscd
+ if test -z $argv[1]
+ if test -n $ROS_WORKSPACE
+ cd $ROS_WORKSPACE
+ return 0
+ end
+ if test -n $CMAKE_PREFIX_PATH[1]
+ for ws in $CMAKE_PREFIX_PATH
+ ls $ws/.catkin
+ if test -f $ws/.catkin
+ cd $ws
+ return 0
+ end
+ end
+ end
+ 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."
+ return 1
+ end
+
+ if test $argv[1] = "--help"
+ echo -e "usage: roscd package\n\nJump to target package."
+ return 0
+ end
+
+ set -l rospath (_ros_decode_path $argv[1] forceeval)
+ if test -z $rospath
+ if test -z $ROS_WORKSPACE
+ echo -e "No ROS_WORKSPACE set. Please set ROS_WORKSPACE to use roscd with no arguments."
+ return 1
+ end
+ cd $ROS_WORKSPACE
+ return 0
+ else
+ cd $rospath
+ return 0
+ end
+end
+
+function _is_integer
+ not test -z (expr $argv[1] - $argv[1] 2>/dev/null)
+ return $status
+end
+
+function rosd
+ if test (count $argv) != 0
+ if test $argv[1] = "--help"
+ echo -e "usage: rosd\n\nDisplays the list of currently remembered directories with indexes."
+ return 0
+ end
+ end
+ set count 0
+ for items in (dirs | sed -e 's/ /\n/g')
+ echo $count $items;
+ set count (expr $count + 1)
+ end
+end
+
+function rospd
+ if test (count $argv) != 0
+ if test $argv[1] = "--help"
+ echo -e "usage: rospd\n\nLike pushd, also accepts indexes from rosd."
+ return 0
+ end
+ else
+ echo -e "usage: rospd\n\nLike pushd, also accepts indexes from rosd."
+ return 0
+ end
+ set -l rospath (_ros_decode_path $argv[1] forceeval)
+ pushd $rospath > /dev/null
+ rosd
+end
+
+function rosls
+ if test (count $argv) != 0
+ if test $argv[1] = "--help"
+ echo -e "usage: rosls [package]\n\nLists contents of a package directory."
+ return 0
+ end
+ else
+ echo -e "usage: rosls [package]\n\nLists contents of a package directory."
+ return 0
+ end
+ set -l rospath (_ros_decode_path $argv[1] forceeval)
+ ls $rospath
+end
+
+# sets arg as return value
+function _roscmd
+ set -l opt
+ if test -n $CMAKE_PREFIX_PATH
+ set -l catkin_package_libexec_dir (catkin_find --without-underlays --libexec $argv[1] 2> /dev/null)
+ end
+ set -l pkgdir (_ros_package_find $argv[1])
+ if test -z $catkin_package_libexec_dir -a -z $pkgdir
+ echo "Couldn't find package $argv[1]"
+ return 1
+ end
+ set -l exepath (find -L $catkin_package_libexec_dir $pkgdir -name $2 -type f ! -regex .*/[.].* ! -regex .*$pkgdir\/build\/.* | uniq)
+ if test (count $execpath) = "0"
+ echo "That file does not exist in that package."
+ return 1
+ else if test (expr (count $exepath) '>' 1) = "1"
+ echo "You have chosen a non-unique filename, please pick one of the following:"
+ for i in (seq (count $execpath))
+ echo $i") " $execpath[i]
+ end
+ read choice
+ set -l opt $execpath[$choice]
+ else
+ set -l opt $exepath[1]
+ end
+ arg=$opt
+end
+
+function rosed
+ set -l arg
+ if test (count $argv) = 0
+ echo -e "usage: rossed [package] [file]\n\nEdit a file within a package."
+ return 0
+ end
+ if test $argv[1] = "--help"
+ echo -e "usage: rossed [package] [file]\n\nEdit a file within a package."
+ return 0
+ end
+ _roscmd $argv[1]
+ if test -n $arg
+ if test -z $EDITOR
+ vi $arg
+ else
+ $EDITOR $arg
+ end
+ end
+end
+
+function roscp
+ set -l arg
+ if test (count $argv) != "3"
+ echo -e "usage: roscp package filename target\n\nCopy a file from a package to target location."
+ return 0
+ end
+ _roscmd $argv[1] $argv[2]
+ cp $arg $argv[3]
+end
+
+function _roscomplete
+ _ros_list_locations
+ _ros_list_stacks
+end
+
+function _roscomplete_sub_dir
+ set -l wd $PWD
+ set -l roslocs (_ros_list_locations)
+ set -l arg (commandline -ct)
+ set -g rosvals
+ set -l path (_ros_decode_path $arg)
+ if test -z $rosvals[1]
+ # Not a full ROS location
+ _ros_list_locations
+ else
+ # The first section is a full ROS location, so we complete from it's subdirs
+ find -L $rosvals[2]$rosvals[3] -maxdepth 1 -mindepth 1 -type d ! -regex ".*/[.].*" -print0 | tr '\000' '\n' | sed -e "s/.*\/\(.*\)/$rosvals[1]\/\1/g"
+ end
+end
+
+function _roscomplete_rosmake
+ _roscomplete
+ set options --test-only --all --mark-installed --unmark-installed --robust --build-everything --specified-only --buildtest --buildtest1 --output --pre-clean --bootstrap --disable-logging --target --pjobs= --threads --profile --skip-blacklist --status-rate
+ for i in $options
+ echo $i
+ end
+end
+
+function _roscomplete_search_dir
+ set -l command (commandline -o)
+ if test (count $command) = 1
+ echo "1" >> ~/output.txt
+ _ros_list_packages
+ end
+ if test (count $command) = 2
+ echo "2" >> ~/output.txt
+ _ros_list_packages
+ end
+ if test (count $command) = 3
+ echo "3" >> ~/output.txt
+ find (_ros_location_find $command[1]) $arg -printf "%f\n"
+ end
+end
+
+function _roscomplete_rosrun
+ _roscomplete_search_dir '-type f -perm +111'
+end
+
+function _roscomplete_file
+ _roscomplete_search_dir '-type f ! -regex .*[.][oa]$'
+end
+
+function _roscomplete_launch
+ if test -z (commandline -ct | grep i-)
+ set options --files --args --nodes --find-node --child --local --screen --server_uri --run_id --wait --port --core --pid --dump-params
+ for i in $options
+ echo $i
+ end
+ else
+ _roscomplete_search_dir '-type f -regex \'.*\.launch$\' -o -type f -regex \'.*\.test$\''
+ end
+end
+
+complete -x -c roscd -a '(_roscomplete_sub_dir)'
+complete -c roscd -l help --description "prints command info"
+complete -c rospd -a '(_roscomplete_sub_dir)'
+complete -c rosls -a '(_roscomplete_sub_dir)'
+complete -c rosls -l help --description "prints command info"
+complete -x -c rosmake -a '(_roscomplete_rosmake)'
+complete -x -c rosclean -a 'check purge'
+complete -x -c rosrun -a '(_roscomplete_rosrun)'
+complete -x -c roslaunch -a '(_roscomplete_launch)'
+complete -x -c rosed -a '(_roscomplete_file)'
+complete -c rosed -l help --description "prints command info"
+complete -x -c roscp -a '(_roscomplete_file)'et -x TEST works
+complete -c roscp -l help --description "prints command info"
diff --git a/tools/rosboost_cfg/CHANGELOG.rst b/tools/rosboost_cfg/CHANGELOG.rst
index a31bd4c..083e121 100644
--- a/tools/rosboost_cfg/CHANGELOG.rst
+++ b/tools/rosboost_cfg/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosboost_cfg
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/rosboost_cfg/package.xml b/tools/rosboost_cfg/package.xml
index 072a5d8..a1fe861 100644
--- a/tools/rosboost_cfg/package.xml
+++ b/tools/rosboost_cfg/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosboost_cfg</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
Contains scripts used by the rosboost-cfg tool for determining cflags/lflags/etc. of boost on your system
</description>
diff --git a/tools/rosclean/CHANGELOG.rst b/tools/rosclean/CHANGELOG.rst
index 5104bbc..5ba7707 100644
--- a/tools/rosclean/CHANGELOG.rst
+++ b/tools/rosclean/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosclean
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/rosclean/package.xml b/tools/rosclean/package.xml
index be660f0..134fe9b 100644
--- a/tools/rosclean/package.xml
+++ b/tools/rosclean/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosclean</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
rosclean: cleanup filesystem resources (e.g. log files).
</description>
diff --git a/tools/roscreate/CHANGELOG.rst b/tools/roscreate/CHANGELOG.rst
index d8a0c99..7771045 100644
--- a/tools/roscreate/CHANGELOG.rst
+++ b/tools/roscreate/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roscreate
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/roscreate/package.xml b/tools/roscreate/package.xml
index 3543eb0..caea03f 100644
--- a/tools/roscreate/package.xml
+++ b/tools/roscreate/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roscreate</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
roscreate contains a tool that assists in the creation of ROS filesystem resources.
It provides: <tt>roscreate-pkg</tt>, which creates a new package directory,
diff --git a/tools/rosmake/CHANGELOG.rst b/tools/rosmake/CHANGELOG.rst
index cae3a6d..4d64139 100644
--- a/tools/rosmake/CHANGELOG.rst
+++ b/tools/rosmake/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosmake
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/rosmake/package.xml b/tools/rosmake/package.xml
index c729eb4..a4ff10f 100644
--- a/tools/rosmake/package.xml
+++ b/tools/rosmake/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosmake</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
rosmake is a ros dependency aware build tool which can be used to
build all dependencies in the correct order.
diff --git a/tools/rosunit/CHANGELOG.rst b/tools/rosunit/CHANGELOG.rst
index 0f2ef3b..ae587ec 100644
--- a/tools/rosunit/CHANGELOG.rst
+++ b/tools/rosunit/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosunit
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.1 (2015-04-16)
+-------------------
+
1.12.0 (2014-12-26)
-------------------
diff --git a/tools/rosunit/package.xml b/tools/rosunit/package.xml
index f229d5d..6a18a67 100644
--- a/tools/rosunit/package.xml
+++ b/tools/rosunit/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosunit</name>
- <version>1.12.0</version>
+ <version>1.12.1</version>
<description>
Unit-testing package for ROS. This is a lower-level library for rostest and handles unit tests, whereas rostest handles integration tests.
</description>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros.git
More information about the debian-science-commits
mailing list