[ros] 01/03: Imported Upstream version 1.12.2
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Mon May 4 12:31:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to branch master
in repository ros.
commit 73d709a9941ed80881b518b464028e575882c197
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Mon May 4 14:26:51 2015 +0200
Imported Upstream version 1.12.2
---
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 | 3 +++
core/roslib/package.xml | 2 +-
ros/package.xml | 2 +-
tools/rosbash/CHANGELOG.rst | 3 +++
tools/rosbash/package.xml | 2 +-
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 | 4 ++++
tools/rosunit/package.xml | 2 +-
tools/rosunit/src/rosunit/core.py | 4 ++--
22 files changed, 44 insertions(+), 13 deletions(-)
diff --git a/core/mk/CHANGELOG.rst b/core/mk/CHANGELOG.rst
index 9f47061..0aa38e3 100644
--- a/core/mk/CHANGELOG.rst
+++ b/core/mk/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package mk
^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/core/mk/package.xml b/core/mk/package.xml
index 00bd188..14f4d7f 100644
--- a/core/mk/package.xml
+++ b/core/mk/package.xml
@@ -1,6 +1,6 @@
<package>
<name>mk</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 714d6a1..67942e4 100644
--- a/core/rosbuild/CHANGELOG.rst
+++ b/core/rosbuild/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosbuild
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/core/rosbuild/package.xml b/core/rosbuild/package.xml
index 541bf59..ad23c43 100644
--- a/core/rosbuild/package.xml
+++ b/core/rosbuild/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosbuild</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 6ece305..a6de675 100644
--- a/core/roslang/CHANGELOG.rst
+++ b/core/roslang/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roslang
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/core/roslang/package.xml b/core/roslang/package.xml
index 922d41d..4bc864b 100644
--- a/core/roslang/package.xml
+++ b/core/roslang/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roslang</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 3d93e55..86ea1e0 100644
--- a/core/roslib/CHANGELOG.rst
+++ b/core/roslib/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roslib
^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
* remove usage of CATKIN_TEST_RESULTS_DIR environment variable (`#80 <https://github.com/ros/ros/pull/80>`_)
diff --git a/core/roslib/package.xml b/core/roslib/package.xml
index bcec23e..6b72ee7 100644
--- a/core/roslib/package.xml
+++ b/core/roslib/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roslib</name>
- <version>1.12.1</version>
+ <version>1.12.2</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/ros/package.xml b/ros/package.xml
index c859bc5..5bc1e35 100644
--- a/ros/package.xml
+++ b/ros/package.xml
@@ -1,6 +1,6 @@
<package>
<name>ros</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 6eeca90..ac39b5d 100644
--- a/tools/rosbash/CHANGELOG.rst
+++ b/tools/rosbash/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosbash
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
* add support for fish shell (`#77 <https://github.com/ros/ros/pull/77>`_)
diff --git a/tools/rosbash/package.xml b/tools/rosbash/package.xml
index 22c6672..7595b36 100644
--- a/tools/rosbash/package.xml
+++ b/tools/rosbash/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosbash</name>
- <version>1.12.1</version>
+ <version>1.12.2</version>
<description>
Assorted shell commands for using ros with bash.
</description>
diff --git a/tools/rosboost_cfg/CHANGELOG.rst b/tools/rosboost_cfg/CHANGELOG.rst
index 083e121..c2b1b22 100644
--- a/tools/rosboost_cfg/CHANGELOG.rst
+++ b/tools/rosboost_cfg/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosboost_cfg
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/tools/rosboost_cfg/package.xml b/tools/rosboost_cfg/package.xml
index a1fe861..d75bdf6 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.1</version>
+ <version>1.12.2</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 5ba7707..1b7e92b 100644
--- a/tools/rosclean/CHANGELOG.rst
+++ b/tools/rosclean/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosclean
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/tools/rosclean/package.xml b/tools/rosclean/package.xml
index 134fe9b..e1adae7 100644
--- a/tools/rosclean/package.xml
+++ b/tools/rosclean/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosclean</name>
- <version>1.12.1</version>
+ <version>1.12.2</version>
<description>
rosclean: cleanup filesystem resources (e.g. log files).
</description>
diff --git a/tools/roscreate/CHANGELOG.rst b/tools/roscreate/CHANGELOG.rst
index 7771045..1d79a07 100644
--- a/tools/roscreate/CHANGELOG.rst
+++ b/tools/roscreate/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package roscreate
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/tools/roscreate/package.xml b/tools/roscreate/package.xml
index caea03f..73e8cac 100644
--- a/tools/roscreate/package.xml
+++ b/tools/roscreate/package.xml
@@ -1,6 +1,6 @@
<package>
<name>roscreate</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 4d64139..c5c5e35 100644
--- a/tools/rosmake/CHANGELOG.rst
+++ b/tools/rosmake/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package rosmake
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+
1.12.1 (2015-04-16)
-------------------
diff --git a/tools/rosmake/package.xml b/tools/rosmake/package.xml
index a4ff10f..c2d5ea0 100644
--- a/tools/rosmake/package.xml
+++ b/tools/rosmake/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosmake</name>
- <version>1.12.1</version>
+ <version>1.12.2</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 ae587ec..52bb7f8 100644
--- a/tools/rosunit/CHANGELOG.rst
+++ b/tools/rosunit/CHANGELOG.rst
@@ -2,6 +2,10 @@
Changelog for package rosunit
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.12.2 (2015-04-27)
+-------------------
+* allow custom environment when determining test results location (`#82 <https://github.com/ros/ros/pull/82>`_)
+
1.12.1 (2015-04-16)
-------------------
diff --git a/tools/rosunit/package.xml b/tools/rosunit/package.xml
index 6a18a67..141c842 100644
--- a/tools/rosunit/package.xml
+++ b/tools/rosunit/package.xml
@@ -1,6 +1,6 @@
<package>
<name>rosunit</name>
- <version>1.12.1</version>
+ <version>1.12.2</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>
diff --git a/tools/rosunit/src/rosunit/core.py b/tools/rosunit/src/rosunit/core.py
index 25db7e7..38726b9 100644
--- a/tools/rosunit/src/rosunit/core.py
+++ b/tools/rosunit/src/rosunit/core.py
@@ -83,7 +83,7 @@ def makedirs_with_parent_perms(p):
if s.st_mode != s2.st_mode:
os.chmod(p, s.st_mode)
-def xml_results_file(test_pkg, test_name, is_rostest=False):
+def xml_results_file(test_pkg, test_name, is_rostest=False, env=None):
"""
@param test_pkg: name of test's package
@type test_pkg: str
@@ -94,7 +94,7 @@ def xml_results_file(test_pkg, test_name, is_rostest=False):
@return: name of xml results file for specified test
@rtype: str
"""
- test_dir = os.path.join(rospkg.get_test_results_dir(), test_pkg)
+ test_dir = os.path.join(rospkg.get_test_results_dir(env=env), test_pkg)
if not os.path.exists(test_dir):
try:
makedirs_with_parent_perms(test_dir)
--
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