[robot-model] 01/01: Imported Upstream version 1.11.8
Jochen Sprickerhof
jspricke-guest at moszumanska.debian.org
Sun Sep 13 16:27:16 UTC 2015
This is an automated email from the git hooks/post-receive script.
jspricke-guest pushed a commit to annotated tag upstream/1.11.8
in repository robot-model.
commit cfb4ab19b86d01d230ab0d45a61cdffef14eece5
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sun Sep 13 18:24:37 2015 +0200
Imported Upstream version 1.11.8
---
collada_parser/CHANGELOG.rst | 3 +++
collada_parser/package.xml | 2 +-
collada_urdf/CHANGELOG.rst | 5 +++++
collada_urdf/CMakeLists.txt | 12 +++---------
collada_urdf/package.xml | 4 +---
collada_urdf/src/urdf_to_collada.cpp | 3 ---
joint_state_publisher/CHANGELOG.rst | 3 +++
joint_state_publisher/package.xml | 2 +-
kdl_parser/CHANGELOG.rst | 3 +++
kdl_parser/package.xml | 2 +-
robot_model/CHANGELOG.rst | 3 +++
robot_model/package.xml | 2 +-
urdf/CHANGELOG.rst | 6 ++++++
urdf/CMakeLists.txt | 6 +++---
urdf/package.xml | 4 +---
urdf/src/model.cpp | 3 ---
urdf_parser_plugin/CHANGELOG.rst | 3 +++
urdf_parser_plugin/package.xml | 2 +-
18 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/collada_parser/CHANGELOG.rst b/collada_parser/CHANGELOG.rst
index d40b8fa..4999e9a 100644
--- a/collada_parser/CHANGELOG.rst
+++ b/collada_parser/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package collada_parser
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+
1.11.7 (2015-04-22)
-------------------
diff --git a/collada_parser/package.xml b/collada_parser/package.xml
index 5216809..ba29ed4 100644
--- a/collada_parser/package.xml
+++ b/collada_parser/package.xml
@@ -1,6 +1,6 @@
<package>
<name>collada_parser</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
This package contains a C++ parser for the Collada robot
description format. The parser reads a Collada XML robot
diff --git a/collada_urdf/CHANGELOG.rst b/collada_urdf/CHANGELOG.rst
index ef93fe1..fba1e07 100644
--- a/collada_urdf/CHANGELOG.rst
+++ b/collada_urdf/CHANGELOG.rst
@@ -2,6 +2,11 @@
Changelog for package collada_urdf
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+* Removed pcre hack for newer released collada-dom.
+* Contributors: Kei Okada
+
1.11.7 (2015-04-22)
-------------------
* Fixed `#89 <https://github.com/ros/robot_model/issues/89>`_
diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt
index 0e301e9..524f2e9 100644
--- a/collada_urdf/CMakeLists.txt
+++ b/collada_urdf/CMakeLists.txt
@@ -44,12 +44,6 @@ endif()
find_package(Boost REQUIRED COMPONENTS system filesystem program_options)
include_directories(${Boost_INCLUDE_DIR})
-find_package(PkgConfig REQUIRED)
-pkg_check_modules(PCRECPP libpcrecpp)
-if( PCRECPP_FOUND )
- include_directories(${PCRECPP_INCLUDE_DIRS})
- link_directories(${PCRECPP_LIBRARY_DIRS})
-endif()
find_package(COLLADA_DOM 2.3 COMPONENTS 1.5)
if( COLLADA_DOM_FOUND )
include_directories(${COLLADA_DOM_INCLUDE_DIRS})
@@ -60,17 +54,17 @@ include_directories(${TinyXML_INCLUDE_DIRS} ${catkin_INCLUDE_DIRS})
link_directories(${catkin_LIBRARY_DIRS})
add_library(${PROJECT_NAME} src/collada_urdf.cpp)
-target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${PCRECPP_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
+target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
${Boost_LIBRARIES} ${ASSIMP_LIBRARIES})
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
add_executable(urdf_to_collada src/urdf_to_collada.cpp)
-target_link_libraries(urdf_to_collada ${catkin_LIBRARIES} ${PCRECPP_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
+target_link_libraries(urdf_to_collada ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES}
${Boost_LIBRARIES} ${PROJECT_NAME})
add_executable(collada_to_urdf src/collada_to_urdf.cpp)
-target_link_libraries(collada_to_urdf ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${PCRECPP_LIBRARIES} ${COLLADA_DOM_LIBRARIES} ${Boost_LIBRARIES})
+target_link_libraries(collada_to_urdf ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES} ${Boost_LIBRARIES})
set_target_properties(collada_to_urdf PROPERTIES COMPILER_FLAGS "${ASSIMP_CXX_FLAGS} ${ASSIMP_CFLAGS_OTHER}")
set_target_properties(collada_to_urdf PROPERTIES LINK_FLAGS "${ASSIMP_LINK_FLAGS}")
diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml
index 90e0ac7..3f196da 100644
--- a/collada_urdf/package.xml
+++ b/collada_urdf/package.xml
@@ -1,6 +1,6 @@
<package>
<name>collada_urdf</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents.
@@ -25,7 +25,6 @@
<build_depend>collada_parser</build_depend>
<build_depend>liburdfdom-dev</build_depend>
<build_depend>liburdfdom-headers-dev</build_depend>
- <build_depend>pcre-dev</build_depend>
<build_depend>roscpp</build_depend>
<build_depend>urdf</build_depend>
<build_depend>geometric_shapes</build_depend>
@@ -39,7 +38,6 @@
<run_depend>liburdfdom-dev</run_depend>
<run_depend>liburdfdom-headers-dev</run_depend>
<run_depend>resource_retriever</run_depend>
- <run_depend>pcre</run_depend>
<run_depend>roscpp</run_depend>
<run_depend>urdf</run_depend>
<run_depend>tf</run_depend>
diff --git a/collada_urdf/src/urdf_to_collada.cpp b/collada_urdf/src/urdf_to_collada.cpp
index 06d6c34..58cec49 100644
--- a/collada_urdf/src/urdf_to_collada.cpp
+++ b/collada_urdf/src/urdf_to_collada.cpp
@@ -37,9 +37,6 @@
#include "collada_urdf/collada_urdf.h"
#include <ros/ros.h>
-#include <pcrecpp.h>
-pcrecpp::RE __re__(""); // https://github.com/ros/robot_model/issues/89
-
int main(int argc, char** argv)
{
if (argc != 3) {
diff --git a/joint_state_publisher/CHANGELOG.rst b/joint_state_publisher/CHANGELOG.rst
index e6138bd..5ec25b5 100644
--- a/joint_state_publisher/CHANGELOG.rst
+++ b/joint_state_publisher/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package joint_state_publisher
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+
1.11.7 (2015-04-22)
-------------------
* Added a randomize button for the joints.
diff --git a/joint_state_publisher/package.xml b/joint_state_publisher/package.xml
index 91b7dac..764c398 100644
--- a/joint_state_publisher/package.xml
+++ b/joint_state_publisher/package.xml
@@ -1,6 +1,6 @@
<package>
<name>joint_state_publisher</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
This package contains a tool for setting and publishing joint state values for a given URDF.
</description>
diff --git a/kdl_parser/CHANGELOG.rst b/kdl_parser/CHANGELOG.rst
index 9ecc031..5a6b54a 100644
--- a/kdl_parser/CHANGELOG.rst
+++ b/kdl_parser/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package kdl_parser
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+
1.11.7 (2015-04-22)
-------------------
diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml
index b5338c6..6ec51f5 100644
--- a/kdl_parser/package.xml
+++ b/kdl_parser/package.xml
@@ -1,6 +1,6 @@
<package>
<name>kdl_parser</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
The Kinematics and Dynamics Library (KDL) defines a tree structure
to represent the kinematic and dynamic parameters of a robot
diff --git a/robot_model/CHANGELOG.rst b/robot_model/CHANGELOG.rst
index d070648..9b69edb 100644
--- a/robot_model/CHANGELOG.rst
+++ b/robot_model/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package robot_model
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+
1.11.7 (2015-04-22)
-------------------
diff --git a/robot_model/package.xml b/robot_model/package.xml
index f6c0673..78af6ed 100644
--- a/robot_model/package.xml
+++ b/robot_model/package.xml
@@ -1,6 +1,6 @@
<package>
<name>robot_model</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
<tt>robot_model</tt> contains packages for modeling various
aspects of robot information, specified in the Xml Robot
diff --git a/urdf/CHANGELOG.rst b/urdf/CHANGELOG.rst
index afe0a95..851a2d0 100644
--- a/urdf/CHANGELOG.rst
+++ b/urdf/CHANGELOG.rst
@@ -2,6 +2,12 @@
Changelog for package urdf
^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+* Removed pcre hack for newer released collada-dom.
+* Fixed link order of libpcrecpp.
+* Contributors: Kei Okada
+
1.11.7 (2015-04-22)
-------------------
* Removed the exporting of Boost and pcre as they are not used in the headers, and added TinyXML because it is.
diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt
index 6e0a655..ae7437e 100644
--- a/urdf/CMakeLists.txt
+++ b/urdf/CMakeLists.txt
@@ -15,9 +15,9 @@ pkg_check_modules(libpcrecpp libpcrecpp)
catkin_package(
LIBRARIES ${PROJECT_NAME}
- INCLUDE_DIRS include
+ INCLUDE_DIRS include ${TinyXML_INLCLUDE_DIRS}
CATKIN_DEPENDS rosconsole_bridge roscpp
- DEPENDS urdfdom_headers urdfdom TinyXML
+ DEPENDS urdfdom_headers urdfdom Boost pcrecpp
)
include_directories(SYSTEM ${Boost_INCLUDE_DIR})
@@ -33,7 +33,7 @@ include_directories(
link_directories(${catkin_LIBRARY_DIRS})
add_library(${PROJECT_NAME} src/model.cpp src/rosconsole_bridge.cpp)
-target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES} ${libpcrecpp_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${TinyXML_LIBRARIES} ${catkin_LIBRARIES} ${urdfdom_LIBRARIES})
if(APPLE)
set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
diff --git a/urdf/package.xml b/urdf/package.xml
index 0698774..fdc0b5f 100644
--- a/urdf/package.xml
+++ b/urdf/package.xml
@@ -1,6 +1,6 @@
<package>
<name>urdf</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
This package contains a C++ parser for the Unified Robot Description
Format (URDF), which is an XML format for representing a robot model.
@@ -23,7 +23,6 @@
<build_depend>liburdfdom-headers-dev</build_depend>
<build_depend>rosconsole_bridge</build_depend>
<build_depend>roscpp</build_depend>
- <build_depend>pcre-dev</build_depend>
<build_depend>urdf_parser_plugin</build_depend>
<build_depend>pluginlib</build_depend>
<build_depend>cmake_modules</build_depend>
@@ -33,7 +32,6 @@
<run_depend>liburdfdom-headers-dev</run_depend>
<run_depend>rosconsole_bridge</run_depend>
<run_depend>roscpp</run_depend>
- <run_depend>pcre</run_depend>
<run_depend>urdf_parser_plugin</run_depend>
<run_depend>pluginlib</run_depend>
diff --git a/urdf/src/model.cpp b/urdf/src/model.cpp
index 636c697..7a6d4ff 100644
--- a/urdf/src/model.cpp
+++ b/urdf/src/model.cpp
@@ -52,9 +52,6 @@
#include <fstream>
#include <iostream>
-#include <pcrecpp.h>
-pcrecpp::RE __re__("");
-
namespace urdf{
static bool IsColladaData(const std::string& data)
diff --git a/urdf_parser_plugin/CHANGELOG.rst b/urdf_parser_plugin/CHANGELOG.rst
index 981e23e..46fe0d7 100644
--- a/urdf_parser_plugin/CHANGELOG.rst
+++ b/urdf_parser_plugin/CHANGELOG.rst
@@ -2,6 +2,9 @@
Changelog for package urdf_parser_plugin
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+1.11.8 (2015-09-11)
+-------------------
+
1.11.7 (2015-04-22)
-------------------
diff --git a/urdf_parser_plugin/package.xml b/urdf_parser_plugin/package.xml
index aeac804..771c09f 100644
--- a/urdf_parser_plugin/package.xml
+++ b/urdf_parser_plugin/package.xml
@@ -1,6 +1,6 @@
<package>
<name>urdf_parser_plugin</name>
- <version>1.11.7</version>
+ <version>1.11.8</version>
<description>
This package contains a C++ base class for URDF parsers.
</description>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/robot-model.git
More information about the debian-science-commits
mailing list