Skip to content

Commit

Permalink
[devel/ros-xacro] Update to 1.9.2
Browse files Browse the repository at this point in the history
Changes since 1.7.3:
1.9.2 (2014-07-11)
------------------
* add a few more tests to exercise the symbol table a bit more
* allow for recursive evaluation of properties in expressions
* add useful debugging information when parameters are not set
* stop test from failing the second time it is run
* unified if/unless handling, correctly handle floating point expressions
* floating point expressions not equal zero are now evaluated as True
* changed quotes to omit cmake warning
* Contributors: Robert Haschke, Mike Ferguson

1.9.1 (2014-06-21)
------------------
* fixup tests so they run
* export architecture_independent flag in package.xml
* installed relocatable fix
* Contributors: Michael Ferguson, Mike Purvis, Scott K Logan

1.9.0 (2014-03-28)
------------------
* Remove the roslint_python glob, use the default one.
* Add roslint target to xacro; two whitespace fixes so that it passes.
* fix evaluation of integers in if statements
  also added a unit test, fixes `#15 <https://github.com/ros/xacro/issues/15>`_
* fix setting of _xacro_py CMake var, fixes `#16
<https://github.com/ros/xacro/issues/16>`_
* Add support for globbing multiple files in a single <xacro:include>
* code cleanup and python3 support
* check for CATKIN_ENABLE_TESTING

1.8.4 (2013-08-06)
------------------
* Merge pull request `#9 <https://github.com/ros/xacro/issues/9>`_ from
davetcoleman/hydro-devel
  Xacro should not use plain 'include' tags but only namespaced ones.
* Fix for the fact that minidom creates text nodes which count as child nodes
* Removed <uri> checking and made it more general for any child element of an
<include> tag
* Removed Groovy reference, only being applied to Hydro
* Created check for Gazebo's <uri> tabs only only shows deprecated warnings if
not present.
* Small spelling fix
* Xacro should not use plain 'include' tags but only namespaced ones.
* Merge pull request `#8 <https://github.com/ros/xacro/issues/8>`_ from
piyushk/hydro-devel-conditional
  xacro conditional blocks
* using refined arguments instead of sys.argv for xml file location
* adding conditional blocks to xacro

1.8.3 (2013-04-22)
------------------
* bumped version to 1.8.3 for hydro release
* backwards compatilibity with rosbuild
* adding unit test for substitution args
* Adding supoprt for substitution_args 'arg' fields
* Remove bin copy of xacro.py
  • Loading branch information
Anthony Mallet committed Aug 18, 2014
1 parent 1a954d8 commit 74ecf79
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 19 deletions.
4 changes: 2 additions & 2 deletions devel/ros-xacro/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#

ROS_PKG= xacro
ROS_VERSION= 1.7.3
ROS_GITTAG= 3786a6a69ba61cd8bdc231ef57ea6916ced2c7a7
ROS_VERSION= 1.9.2

CATEGORIES= devel
ROS_COMMENT= XML macro language
Expand All @@ -15,4 +14,5 @@ SUBST_FILES.py-interp+= scripts/*.py
include ../../meta-pkgs/ros-base/Makefile.common

include ../../devel/ros-catkin/depend.mk
include ../../devel/ros-lint/depend.mk
include ../../mk/robotpkg.mk
10 changes: 3 additions & 7 deletions devel/ros-xacro/PLIST
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
@comment Tue Aug 6 12:14:07 CEST 2013
bin/xacro.py
@comment Wed Aug 13 16:51:29 CEST 2014
lib/pkgconfig/xacro.pc
${PYTHON_SITELIB}/xacro-${PKGVERSION}-py${PYTHON_VERSION}.egg-info
${PYTHON_SITELIB}/xacro/__init__.py
${PYTHON_SITELIB}/xacro/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyc
${PYTHON_SITELIB}/xacro/${PYTHON_PYCACHE}/__init__${PYTHON_TAG}.pyo
lib/xacro/xacro.py
lib/xacro/${PYTHON_PYCACHE}/xacro${PYTHON_TAG}.pyc
lib/xacro/${PYTHON_PYCACHE}/xacro${PYTHON_TAG}.pyo
lib/xacro/xacro
share/xacro/cmake/xacro-extras.cmake
share/xacro/cmake/xacroConfig-version.cmake
share/xacro/cmake/xacroConfig.cmake
share/xacro/package.xml
share/xacro/xacro.py
14 changes: 7 additions & 7 deletions devel/ros-xacro/depend.mk
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ SYSTEM_PREFIX.ros-xacro?= ${SYSTEM_PREFIX.ros-base}
DEPEND_USE+= ros-xacro
ROS_DEPEND_USE+= ros-xacro

DEPEND_ABI.ros-xacro?= ros-xacro>=1.6
DEPEND_DIR.ros-xacro= ../../devel/ros-xacro
DEPEND_ABI.ros-xacro?= ros-xacro>=1.7
DEPEND_DIR.ros-xacro= ../../devel/ros-xacro

DEPEND_ABI.ros-xacro.fuerte += ros-xacro>=1.6<1.7
DEPEND_ABI.ros-xacro.groovy += ros-xacro>=1.7<1.8
DEPEND_ABI.ros-xacro.hydro += ros-xacro>=1.8<1.9
DEPEND_ABI.ros-xacro.groovy+= ros-xacro>=1.7<1.8
DEPEND_ABI.ros-xacro.hydro+= ros-xacro>=1.8<1.9
DEPEND_ABI.ros-xacro.indigo+= ros-xacro>=1.9<1.10

SYSTEM_SEARCH.ros-xacro=\
bin/xacro.py \
'share/xacro/${ROS_STACKAGE}:/<version>/s/[^0-9.]//gp' \
'lib/xacro/xacro' \
'share/xacro/package.xml:/<version>/s/[^0-9.]//gp' \
'lib/pkgconfig/xacro.pc:/Version/s/[^0-9.]//gp'

endif # ROS_XACRO_DEPEND_MK --------------------------------------------
Expand Down
6 changes: 3 additions & 3 deletions devel/ros-xacro/distinfo
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
SHA1 (ros/xacro-1.7.3.tar.gz) = f7ced25f358a0913fd0878ded4d130b191564d30
RMD160 (ros/xacro-1.7.3.tar.gz) = 43a89a740df38049c2a911fc518eb87a7ee3371e
Size (ros/xacro-1.7.3.tar.gz) = 8389 bytes
SHA1 (ros/xacro/1.9.2.tar.gz) = 2a045699c2a04fb04e3de5607e99114665e0c236
RMD160 (ros/xacro/1.9.2.tar.gz) = 27882f8241365a7d600c332ebf73d084260dd09d
Size (ros/xacro/1.9.2.tar.gz) = 13787 bytes

0 comments on commit 74ecf79

Please sign in to comment.