diff --git a/collada_parser/CMakeLists.txt b/collada_parser/CMakeLists.txt index 15e8482..7d07ef8 100644 --- a/collada_parser/CMakeLists.txt +++ b/collada_parser/CMakeLists.txt @@ -1,6 +1,12 @@ +cmake_minimum_required(VERSION 2.8.3) project(collada_parser) -catkin_project(${PROJECT_NAME} + +find_package(catkin REQUIRED) + +find_package(catkin REQUIRED COMPONENTS urdfdom_headers) + +catkin_package( LIBRARIES ${PROJECT_NAME} INCLUDE_DIRS include DEPENDS urdfdom_headers) @@ -10,8 +16,7 @@ include_directories(include) find_package(Boost REQUIRED system) include_directories(${Boost_INCLUDE_DIR}) -find_package(urdfdom_headers REQUIRED) -include_directories(${urdfdom_headers_INCLUDE_DIRS}) +include_directories(${catkin_INCLUDE_DIRS}) set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake-extensions/ ) find_package(PkgConfig) diff --git a/collada_parser/manifest.xml b/collada_parser/manifest.xml deleted file mode 100644 index d45233a..0000000 --- a/collada_parser/manifest.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - This package contains a C++ parser for the Collada robot - description format. The parser reads a Collada XML robot - description, and creates a C++ URDF model. Although it is possible - to directly use this parser when working with Collada robot - descriptions, the preferred user API is found in the urdf package. - - Rosen Diankov, Kei Okada - BSD - - http://ros.org/wiki/collada_parser - - - - - - - - - - - - - - - - diff --git a/collada_parser/package.xml b/collada_parser/package.xml new file mode 100644 index 0000000..44b3b03 --- /dev/null +++ b/collada_parser/package.xml @@ -0,0 +1,33 @@ + + collada_parser + 1.9.13 + + This package contains a C++ parser for the Collada robot + description format. The parser reads a Collada XML robot + description, and creates a C++ URDF model. Although it is possible + to directly use this parser when working with Collada robot + descriptions, the preferred user API is found in the urdf package. + + Rosen Diankov + Kei Okada + Ioan Sucan + BSD + http://ros.org/wiki/collada_parser + + colladadom + roscpp + urdfdom_headers + + colladadom + roscpp + urdfdom_headers + + + + + + + diff --git a/collada_urdf/CMakeLists.txt b/collada_urdf/CMakeLists.txt index fa14ffb..3063789 100644 --- a/collada_urdf/CMakeLists.txt +++ b/collada_urdf/CMakeLists.txt @@ -1,9 +1,11 @@ project(collada_urdf) -catkin_project(${PROJECT_NAME} +find_package(catkin REQUIRED COMPONENTS angles collada_parser resource_retriever urdf) + +catkin_package( LIBRARIES ${PROJECT_NAME} INCLUDE_DIRS include - DEPENDS collada_parser urdf) + DEPENDS angles collada_parser resource_retriever urdf) include_directories(include) @@ -41,24 +43,15 @@ if( COLLADA_DOM_FOUND ) link_directories(${COLLADA_DOM_LIBRARY_DIRS}) endif() -find_package(urdf) -include_directories(${urdf_INCLUDE_DIRS}) -link_directories(${urdf_LIBRARY_DIRS}) -find_package(resource_retriever) -include_directories(${resource_retriever_INCLUDE_DIRS}) -link_directories(${resource_retriever_LIBRARY_DIRS}) -find_package(collada_parser) -include_directories(${collada_parser_INCLUDE_DIRS}) -link_directories(${collada_parser_LIBRARY_DIRS}) +include_directories(${catkin_INCLUDE_DIRS}) +link_directories(${catkin_LIBRARY_DIRS}) -find_package(catkin REQUIRED angles) -include_directories(${angles_INCLUDE_DIRS}) add_library(${PROJECT_NAME} src/collada_urdf.cpp) -target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${ASSIMP_LIBRARIES} ${collada_parser_LIBRARIES} ${COLLADA_DOM_LIBRARIES} ${urdf_LIBRARIES} - ${resource_retriever_LIBRARIES} ${angles_LIBRARIES} ${Boost_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${ASSIMP_LIBRARIES} ${catkin_LIBRARIES} ${COLLADA_DOM_LIBRARIES} + ${Boost_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}") diff --git a/collada_urdf/manifest.xml b/collada_urdf/manifest.xml deleted file mode 100644 index a569352..0000000 --- a/collada_urdf/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents. - - Implements robot-specific COLLADA extensions as defined by - http://openrave.programmingvision.com/index.php/Started:COLLADA - - Tim Field and Rosen Diankov - BSD - - http://ros.org/wiki/collada_urdf - - - - - - - - - - - - - diff --git a/collada_urdf/package.xml b/collada_urdf/package.xml new file mode 100644 index 0000000..56b629c --- /dev/null +++ b/collada_urdf/package.xml @@ -0,0 +1,43 @@ + + collada_urdf + 1.9.13 + + + This package contains a tool to convert Unified Robot Description Format (URDF) documents into COLLAborative Design Activity (COLLADA) documents. + + Implements robot-specific COLLADA extensions as defined by + http://openrave.programmingvision.com/index.php/Started:COLLADA + + Tim Field + Rosen Diankov + Ioan Sucan BSD + http://ros.org/wiki/collada_urdf + + + angles + assimp + resource_retriever + collada_parser + roscpp + urdf + + angles + assimp + collada_parser + resource_retriever + roscpp + urdf + + + + + + diff --git a/kdl_parser/CMakeLists.txt b/kdl_parser/CMakeLists.txt index 520890c..fcd1b15 100644 --- a/kdl_parser/CMakeLists.txt +++ b/kdl_parser/CMakeLists.txt @@ -1,9 +1,13 @@ +cmake_minimum_required(VERSION 2.8.3) + project(kdl_parser) -catkin_project(${PROJECT_NAME} +find_package(catkin REQUIRED COMPONENTS collada_parser roscpp rosconsole urdf) + +catkin_package( LIBRARIES ${PROJECT_NAME} INCLUDE_DIRS include - DEPENDS urdf) + DEPENDS collada_parser roscpp rosconsole urdf) include_directories(include) @@ -12,24 +16,15 @@ include_directories(${Boost_INCLUDE_DIR}) find_library(tinyxml_library tinyxml) -find_package(catkin REQUIRED COMPONENTS roscpp rosconsole) -include_directories(${catkin_INCLUDE_DIRS}) -link_directories(${catkin_LIBRARY_DIRS}) - find_package(Orocos-KDL REQUIRED) include_directories(${Orocos-KDL_INCLUDE_DIRS}) link_directories(${Orocos-KDL_LIBRARY_DIRS}) -find_package(urdf) -include_directories(${urdf_INCLUDE_DIRS}) -link_directories(${urdf_LIBRARY_DIRS}) - -find_package(collada_parser REQUIRED) -include_directories(${collada_parser_INCLUDE_DIRS}) -link_directories(${collada_parser_LIBRARY_DIRS}) +include_directories(${catkin_INCLUDE_DIRS}) +link_directories(${catkin_LIBRARY_DIRS}) add_library(${PROJECT_NAME} src/kdl_parser.cpp) -target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${Orocos-KDL_LIBRARIES} ${collada_parser_LIBRARIES} ${urdf_LIBRARIES} ${catkin_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} ${tinyxml_library} ${Orocos-KDL_LIBRARIES} ${catkin_LIBRARIES}) add_executable(check_kdl_parser src/check_kdl_parser.cpp ) target_link_libraries(check_kdl_parser ${PROJECT_NAME}) diff --git a/kdl_parser/manifest.xml b/kdl_parser/manifest.xml deleted file mode 100644 index 5fc08cb..0000000 --- a/kdl_parser/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - The Kinematics and Dynamics Library (KDL) defines a tree structure - to represent the kinematic and dynamic parameters of a robot - mechanism. kdl_parser provides tools to construct a KDL - tree from an XML robot representation in either the URDf format or - the Collada format. - - - Wim Meeussen wim@willowgarage.com - BSD - - http://ros.org/wiki/kdl_parser - - - - - - - - - - - diff --git a/kdl_parser/package.xml b/kdl_parser/package.xml new file mode 100644 index 0000000..3ea406b --- /dev/null +++ b/kdl_parser/package.xml @@ -0,0 +1,43 @@ + + kdl_parser + 1.9.13 + + + + The Kinematics and Dynamics Library (KDL) defines a tree structure + to represent the kinematic and dynamic parameters of a robot + mechanism. kdl_parser provides tools to construct a KDL + tree from an XML robot representation in either the URDf format or + the Collada format. + + + Wim Meeussen + Ioan Sucan BSD + http://ros.org/wiki/kdl_parser + + + catkin + collada_parser + orocos_kdl + rosconsole + roscpp + urdf + + + catkin + collada_parser + orocos_kdl + rosconsole + roscpp + urdf + + + + + + + + diff --git a/resource_retriever/CMakeLists.txt b/resource_retriever/CMakeLists.txt index 9bf4a36..e985c13 100644 --- a/resource_retriever/CMakeLists.txt +++ b/resource_retriever/CMakeLists.txt @@ -1,6 +1,8 @@ project(resource_retriever) -catkin_project(${PROJECT_NAME} +find_package(catkin REQUIRED COMPONENTS rosconsole roslib) + +catkin_package( LIBRARIES ${PROJECT_NAME} INCLUDE_DIRS include) diff --git a/resource_retriever/manifest.xml b/resource_retriever/manifest.xml deleted file mode 100644 index 21e1bdc..0000000 --- a/resource_retriever/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - This package retrieves data from url-format files such as http://, - ftp://, package:// file://, etc., and loads the data into memory. - The package:// url for ros packages is translated into a local - file:// url. The resourse retriever was initially designed to load - mesh files into memory, but it can be used for any type of - data. The resource retriever is based on the the libcurl library. - - - Josh Faust (jfaust@willowgarage.com) - BSD - - http://ros.org/wiki/resource_retriever - - - - - - - - - - diff --git a/resource_retriever/package.xml b/resource_retriever/package.xml new file mode 100644 index 0000000..f8054ab --- /dev/null +++ b/resource_retriever/package.xml @@ -0,0 +1,39 @@ + + resource_retriever + 1.9.13 + + + This package retrieves data from url-format files such as http://, + ftp://, package:// file://, etc., and loads the data into memory. + The package:// url for ros packages is translated into a local + file:// url. The resourse retriever was initially designed to load + mesh files into memory, but it can be used for any type of + data. The resource retriever is based on the the libcurl library. + + + Josh Faust + Ioan Sucan + BSD + http://ros.org/wiki/resource_retriever + + catkin + curl + rosconsole + roslib + + + catkin + curl + rosconsole + roslib + + + + + + + diff --git a/robot_model/package.xml b/robot_model/package.xml new file mode 100644 index 0000000..f1b9ddd --- /dev/null +++ b/robot_model/package.xml @@ -0,0 +1,60 @@ + + robot_model + 1.9.13 + + robot_model contains packages for modeling various + aspects of robot information, specified in the Xml Robot + Description Format (URDF). The core package of this stack + is urdf, which parses URDF files, and constructs an + object model (C++) of the robot. + + + Ioan Sucan + Ioan Sucan + + BSD + GPL + MIT + + Willow Garage + + http://ros.org/wiki/robot_model + + catkin + common_msgs + orocos_kdl + ros + ros_comm + geometry_angles_utils + rosconsole_bridge + graphviz + geometry + curl + assimp + urdfdom + urdfdom_headers + collada-dev + convex_decomposition + ivcon + + common_msgs + orocos_kdl + ros + ros_comm + geometry_angles_utils + rosconsole_bridge + graphviz + geometry + curl + assimp + urdfdom + urdfdom_headers + collada-dev + convex_decomposition + ivcon + + + + + + diff --git a/srdf/CMakeLists.txt b/srdf/CMakeLists.txt index 868372c..3e9721a 100644 --- a/srdf/CMakeLists.txt +++ b/srdf/CMakeLists.txt @@ -1,6 +1,6 @@ project(srdf) -catkin_project(${PROJECT_NAME} +catkin_package( INCLUDE_DIRS include ) diff --git a/srdf/manifest.xml b/srdf/manifest.xml deleted file mode 100644 index 6db961e..0000000 --- a/srdf/manifest.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - SRDF (Semantic Robot Description Format) is a representation of - semantic information about robots. - - - Ioan Sucan - BSD - - http://ros.org/wiki/srdf - - - - - - - - - diff --git a/srdf/package.xml b/srdf/package.xml new file mode 100644 index 0000000..92e2cbf --- /dev/null +++ b/srdf/package.xml @@ -0,0 +1,33 @@ + + srdf + 1.9.13 + + + + SRDF (Semantic Robot Description Format) is a representation of + semantic information about robots. + + + Ioan Sucan + Ioan Sucan BSD + + http://ros.org/wiki/srdf + + + catkin + srdfdom + tinyxml + + + catkin + srdfdom + tinyxml + + + + + + diff --git a/stack.xml b/stack.xml deleted file mode 100644 index ba7c0c5..0000000 --- a/stack.xml +++ /dev/null @@ -1,55 +0,0 @@ - - robot_model - 1.9.13 - - robot_model contains packages for modeling various - aspects of robot information, specified in the Xml Robot - Description Format (URDF). The core package of this stack - is urdf, which parses URDF files, and constructs an - object model (C++) of the robot. - - - Maintained by Ioan Sucan - - Ioan Sucan - BSD,GPL,MIT - - Willow Garage - - - http://ros.org/wiki/robot_model - - catkin - common_msgs - orocos_kdl - ros - ros_comm - geometry_angles_utils - rosconsole_bridge - graphviz - geometry - curl - assimp - urdfdom - urdfdom_headers - collada-dev - convex_decomposition - ivcon - - common_msgs - orocos_kdl - ros - ros_comm - geometry_angles_utils - rosconsole_bridge - graphviz - geometry - curl - assimp - urdfdom - urdfdom_headers - collada-dev - convex_decomposition - ivcon - - diff --git a/urdf/CMakeLists.txt b/urdf/CMakeLists.txt index b396401..f08a8bf 100644 --- a/urdf/CMakeLists.txt +++ b/urdf/CMakeLists.txt @@ -1,28 +1,18 @@ project(urdf) -catkin_project(${PROJECT_NAME} +find_package(catkin REQUIRED COMPONENTS urdfdom urdfdom_headers collada_parser rosconsole_bridge roscpp) + +catkin_package( LIBRARIES ${PROJECT_NAME} INCLUDE_DIRS include - DEPENDS urdfdom urdfdom_headers collada_parser roscpp) + DEPENDS urdfdom urdfdom_headers collada_parser rosconsole_bridge roscpp) include_directories(include) -find_package(urdfdom_headers REQUIRED) -include_directories(${urdfdom_headers_INCLUDE_DIRS}) +include_directories(${catkin_INCLUDE_DIRS}) +link_directories(${catkin_LIBRARY_DIRS}) -find_package(urdfdom REQUIRED) -include_directories(${urdfdom_INCLUDE_DIRS}) -link_directories(${urdfdom_LIBRARY_DIRS}) - -find_package(collada_parser REQUIRED) -include_directories(${collada_parser_INCLUDE_DIRS}) -link_directories(${collada_parser_LIBRARY_DIRS}) - -find_package(rosconsole_bridge REQUIRED) -include_directories(${rosconsole_bridge_INCLUDE_DIRS}) -link_directories(${rosconsole_bridge_LIBRARY_DIRS}) - -find_package(catkin REQUIRED COMPONENTS roscpp rosconsole rostime) +find_package(catkin REQUIRED COMPONENTS roscpp rosconsole_bridge rostime) include_directories(${catkin_INCLUDE_DIRS}) link_directories(${catkin_LIBRARY_DIRS}) diff --git a/urdf/manifest.xml b/urdf/manifest.xml deleted file mode 100644 index 80ee971..0000000 --- a/urdf/manifest.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - This package contains a C++ parser for the Unified Robot Description - Format (URDF), which is an XML format for representing a robot model. - The code API of the parser has been through our review process and will remain - backwards compatible in future releases. - - Maintained by Ioan Sucan - BSD - - http://ros.org/wiki/urdf - - - - - - - - - - - - - - diff --git a/urdf/package.xml b/urdf/package.xml new file mode 100644 index 0000000..5bbf98d --- /dev/null +++ b/urdf/package.xml @@ -0,0 +1,42 @@ + + urdf + 1.9.13 + + This package contains a C++ parser for the Unified Robot Description + Format (URDF), which is an XML format for representing a robot model. + The code API of the parser has been through our review process and will remain + backwards compatible in future releases. + + Ioan Sucan + Ioan Sucan + BSD + http://ros.org/wiki/urdf + + + catkin + collada_parser + rosconsole_bridge + roscpp + urdfdom + + catkin + collada_parser + rosconsole_bridge + roscpp + urdfdom + + + + + + + + + + diff --git a/urdf_interface/CMakeLists.txt b/urdf_interface/CMakeLists.txt index aae23a9..ed19007 100644 --- a/urdf_interface/CMakeLists.txt +++ b/urdf_interface/CMakeLists.txt @@ -1,7 +1,10 @@ project(urdf_interface) -catkin_project(${PROJECT_NAME} +find_package(catkin REQUIRED COMPONENTS urdfdom) + +catkin_package( INCLUDE_DIRS include + DEPENDS urdfdom ) install(DIRECTORY include/ diff --git a/urdf_interface/manifest.xml b/urdf_interface/manifest.xml deleted file mode 100644 index e01c427..0000000 --- a/urdf_interface/manifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. - - This package contains URDF C++ interface headers that define the - user API to the C++ URDF model. - - Wim Meeussen, John Hsu - BSD - - http://ros.org/wiki/urdf_interface - - - - - - - - - - diff --git a/urdf_interface/package.xml b/urdf_interface/package.xml new file mode 100644 index 0000000..f295408 --- /dev/null +++ b/urdf_interface/package.xml @@ -0,0 +1,29 @@ + + urdf_interface + 1.9.13 + + This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. + + This package contains URDF C++ interface headers that define the + user API to the C++ URDF model. + + Wim Meeussen + John Hsu + Ioan Sucan + BSD + http://ros.org/wiki/urdf_interface + + catkin + urdfdom + + catkin + urdfdom + + + + + + + + + diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt index a9f7292..c4d486b 100644 --- a/urdf_parser/CMakeLists.txt +++ b/urdf_parser/CMakeLists.txt @@ -1,2 +1,8 @@ +cmake_minimum_required(VERSION 2.8.3) project(urdf_parser) -catkin_project(${PROJECT_NAME}) + +find_package(catkin REQUIRED COMPONENTS urdfdom) + +catkin_package( + DEPENDS urdfdom + ) diff --git a/urdf_parser/manifest.xml b/urdf_parser/package.xml similarity index 54% rename from urdf_parser/manifest.xml rename to urdf_parser/package.xml index fc0d779..5630636 100644 --- a/urdf_parser/manifest.xml +++ b/urdf_parser/package.xml @@ -1,5 +1,8 @@ - + urdf_parser + 1.9.13 + + This package is DEPRECATED. Please use the urdfdom dependency directly instead of this package. This package contains a C++ parser for the Unified Robot @@ -9,15 +12,23 @@ this parser when working with URDF robot descriptions, the preferred user API is found in the urdf package. - Wim Meeussen, John Hsu, Rosen Diankov + Wim Meeussen + John Hsu + Rosen Diankov + Ioan Sucan BSD - - http://ros.org/wiki/urdf_parser - + http://ros.org/wiki/urdf_parser + + + catkin + urdfdom + + catkin + urdfdom + -