changed package.xml to format v2

ROBOTIS-GIT · Mar 20, 2018 · 2226961 · 2226961
1 parent 163fe60
commit 2226961
Show file tree

Hide file tree

Showing 14 changed files with 329 additions and 327 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,14 +12,14 @@ compiler:
   - gcc
 notifications:
   email:
-    on_success: always
+    on_success: change
     on_failure: always
     recipients:
       - pyo@robotis.com
 env:
   matrix:
     - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian
-    - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
+#   - ROS_DISTRO=kinetic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=jessie
 branches:
   only:
     - master

diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
@@ -1,9 +1,15 @@
-# Dynamixel workbench packages
+# Dynamixel Workbench Metapackage
+[![GitHub version](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench.svg)](https://badge.fury.io/gh/ROBOTIS-GIT%2Fdynamixel-workbench) [![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg?branch=master)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench)
 
-[![Build Status](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench.svg)](https://travis-ci.org/ROBOTIS-GIT/dynamixel-workbench)
+# Documents for dynamixel_workbench packages
+- [ROBOTIS e-Manual](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/#package-description)
+- http://wiki.ros.org/dynamixel_workbench
 
-For more information, please check the document below.
+# ROS packages related to Dynamixel Workbench
+- [dynamixel_sdk](https://github.com/ROBOTIS-GIT/DynamixelSDK)
+- [dynamixel_workbench](https://github.com/ROBOTIS-GIT/dynamixel-workbench)
+- [dynamixel_workbench_msgs](https://github.com/ROBOTIS-GIT/dynamixel-workbench-msgs)
 
-[ROS Wiki for Dynamixel workbench](http://wiki.ros.org/dynamixel_workbench)
-
-[e-Manual for Dynamixel workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)
+# Documents and Videos for Dynamixel Workbench
+- [ROBOTIS e-Manual for Dynamixel SDK](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_sdk/overview/)
+- [ROBOTIS e-Manual for Dynamixel Workbench](http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/)
diff --git a/dynamixel_workbench/package.xml b/dynamixel_workbench/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
   <name>dynamixel_workbench</name>
   <version>0.2.3</version>
   <description>
@@ -8,17 +8,18 @@
     Furthermore, it supports various controllers based on operating mode and Dynamixel SDK.
     These controllers are commanded by operators.
   </description>
-  <license>Apache License 2.0</license>
+  <license>Apache 2.0</license>
   <author email="thlim@robotis.com">Darby Lim</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
-  <url type="repository">https://github.com/ROBOTIS-GIT/dynamixel-workbench</url>
   <url type="website">http://wiki.ros.org/dynamixel_workbench</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/</url>
+  <url type="repository">https://github.com/ROBOTIS-GIT/dynamixel-workbench</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
-  <run_depend>dynamixel_workbench_single_manager</run_depend>
-  <run_depend>dynamixel_workbench_single_manager_gui</run_depend>
-  <run_depend>dynamixel_workbench_controllers</run_depend>
-  <run_depend>dynamixel_workbench_operators</run_depend>
-  <run_depend>dynamixel_workbench_toolbox</run_depend>
+  <exec_depend>dynamixel_workbench_controllers</exec_depend>
+  <exec_depend>dynamixel_workbench_operators</exec_depend>
+  <exec_depend>dynamixel_workbench_single_manager</exec_depend>
+  <exec_depend>dynamixel_workbench_single_manager_gui</exec_depend>
+  <exec_depend>dynamixel_workbench_toolbox</exec_depend>
   <export><metapackage/></export>
 </package>
diff --git a/dynamixel_workbench_controllers/CMakeLists.txt b/dynamixel_workbench_controllers/CMakeLists.txt
@@ -1,21 +1,25 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(dynamixel_workbench_controllers)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+## Compile as C++11, supported in ROS Kinetic and newer
+add_compile_options(-std=c++11)
 
 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
   roscpp
   dynamixel_workbench_msgs
-  dynamixel_sdk
   dynamixel_workbench_toolbox
 )
 
+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@@ -25,20 +29,19 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 
 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
  INCLUDE_DIRS include
- LIBRARIES ${PROJECT_NAME}
- CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox dynamixel_sdk
+ CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox
 )
 
 ################################################################################
 # Build
 ################################################################################
 include_directories(
-  ${catkin_INCLUDE_DIRS}
   include
+  ${catkin_INCLUDE_DIRS}
 )
 
 add_executable(position_control src/position_control.cpp)
@@ -61,17 +64,15 @@ target_link_libraries(torque_control ${catkin_LIBRARIES})
 ## Install
 #################################################################################
 install(TARGETS position_control velocity_control multi_port torque_control
-  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
-install(DIRECTORY launch/
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+install(DIRECTORY launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
 ################################################################################

diff --git a/dynamixel_workbench_controllers/package.xml b/dynamixel_workbench_controllers/package.xml
@@ -1,24 +1,19 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
   <name>dynamixel_workbench_controllers</name>
   <version>0.2.3</version>
   <description>
     This package contains examples of applying the 'dynamixel_workbench_toolbox' library developed on the basis of dynamixel_sdk to various operating modes of Dynamixel.
   </description>
-  <license>Apache License 2.0</license>
+  <license>Apache 2.0</license>
   <author email="thlim@robotis.com">Darby Lim</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
+  <url type="website">http://wiki.ros.org/dynamixel_workbench_controllers</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/dynamixel-workbench</url>
-  <url type="website">http://wiki.ros.org/dynamixel_workbench</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamixel_sdk</build_depend>
-  <build_depend>dynamixel_workbench_msgs</build_depend>
-  <build_depend>dynamixel_workbench_toolbox</build_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>dynamixel_sdk</run_depend>
-  <run_depend>dynamixel_workbench_msgs</run_depend>
-  <run_depend>dynamixel_workbench_toolbox</run_depend>
-  <export></export>
+  <depend>roscpp</depend>
+  <depend>dynamixel_workbench_msgs</depend>
+  <depend>dynamixel_workbench_toolbox</depend>
 </package>
diff --git a/dynamixel_workbench_operators/CMakeLists.txt b/dynamixel_workbench_operators/CMakeLists.txt
@@ -1,19 +1,24 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(dynamixel_workbench_operators)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+## Compile as C++11, supported in ROS Kinetic and newer
+add_compile_options(-std=c++11)
 
 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
   roscpp
   dynamixel_workbench_msgs
 )
 
+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@@ -23,11 +28,10 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 
 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
- LIBRARIES ${PROJECT_NAME}
- CATKIN_DEPENDS roscpp dynamixel_workbench_msgs
+  CATKIN_DEPENDS roscpp dynamixel_workbench_msgs
 )
 
 ################################################################################
@@ -49,8 +53,6 @@ target_link_libraries(wheel_operator ${catkin_LIBRARIES})
 ## Install
 #################################################################################
 install(TARGETS joint_operator wheel_operator
-  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 

diff --git a/dynamixel_workbench_operators/package.xml b/dynamixel_workbench_operators/package.xml
@@ -1,19 +1,18 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
   <name>dynamixel_workbench_operators</name>
   <version>0.2.3</version>
   <description>
     This package contains nodes that control the Dynamixel by communicating with the server registered in the 'dynamixel_workbench_controllers' package
   </description>
-  <license>Apache License 2.0</license>
+  <license>Apache 2.0</license>
   <author email="thlim@robotis.com">Darby Lim</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
+  <url type="website">http://wiki.ros.org/dynamixel_workbench_operators</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/dynamixel-workbench</url>
-  <url type="website">http://wiki.ros.org/dynamixel_workbench</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamixel_workbench_msgs</build_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>dynamixel_workbench_msgs</run_depend>
+  <depend>roscpp</depend>
+  <depend>dynamixel_workbench_msgs</depend>
 </package>
diff --git a/dynamixel_workbench_single_manager/CMakeLists.txt b/dynamixel_workbench_single_manager/CMakeLists.txt
@@ -1,21 +1,25 @@
 ################################################################################
-# CMake
+# Set minimum required version of cmake, project name and compile options
 ################################################################################
 cmake_minimum_required(VERSION 2.8.3)
 project(dynamixel_workbench_single_manager)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")
+## Compile as C++11, supported in ROS Kinetic and newer
+add_compile_options(-std=c++11)
 
 ################################################################################
-# Packages
+# Find catkin packages and libraries for catkin and system dependencies
 ################################################################################
 find_package(catkin REQUIRED COMPONENTS
   roscpp
-  dynamixel_sdk
   dynamixel_workbench_msgs
   dynamixel_workbench_toolbox
 )
 
+################################################################################
+# Setup for python modules and scripts
+################################################################################
+
 ################################################################################
 # Declare ROS messages, services and actions
 ################################################################################
@@ -25,20 +29,19 @@ find_package(catkin REQUIRED COMPONENTS
 ################################################################################
 
 ################################################################################
-# Catkin specific configuration
+# Declare catkin specific configuration to be passed to dependent projects
 ################################################################################
 catkin_package(
   INCLUDE_DIRS include
-  LIBRARIES ${PROJECT_NAME}
   CATKIN_DEPENDS roscpp dynamixel_workbench_msgs dynamixel_workbench_toolbox dynamixel_sdk
 )
 
 ################################################################################
 # Build
 ################################################################################
 include_directories(
-  ${catkin_INCLUDE_DIRS}
   include
+  ${catkin_INCLUDE_DIRS}
 )
 
 add_executable(single_dynamixel_controller src/single_dynamixel_controller.cpp)
@@ -53,17 +56,15 @@ target_link_libraries(single_dynamixel_monitor ${catkin_LIBRARIES})
 # Install
 ################################################################################
 install(TARGETS single_dynamixel_controller single_dynamixel_monitor
-  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
 )
 
-install(DIRECTORY launch/
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/launch
+install(DIRECTORY launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
 ################################################################################

diff --git a/dynamixel_workbench_single_manager/package.xml b/dynamixel_workbench_single_manager/package.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0"?>
-<package>
+<package format="2">
   <name>dynamixel_workbench_single_manager</name>
   <version>0.2.3</version>
   <description>
     This package is single manager for a Dynamixel.
     It provides a terminal environment to check the status of Dynamixel and control it before using Dynamixel
   </description>
-  <license>Apache License 2.0</license>
+  <license>Apache 2.0</license>
   <author email="thlim@robotis.com">Darby Lim</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
-  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
+  <url type="website">http://wiki.ros.org/dynamixel_workbench_single_manager</url>
+  <url type="emanual">http://emanual.robotis.com/docs/en/software/dynamixel/dynamixel_workbench/</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/dynamixel-workbench</url>
-  <url type="website">http://wiki.ros.org/dynamixel_workbench</url>
+  <url type="bugtracker">https://github.com/ROBOTIS-GIT/dynamixel-workbench/issues</url>
   <buildtool_depend>catkin</buildtool_depend>
-  <build_depend>roscpp</build_depend>
-  <build_depend>dynamixel_sdk</build_depend>
-  <build_depend>dynamixel_workbench_msgs</build_depend>
-  <build_depend>dynamixel_workbench_toolbox</build_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>dynamixel_sdk</run_depend>
-  <run_depend>dynamixel_workbench_msgs</run_depend>
-  <run_depend>dynamixel_workbench_toolbox</run_depend>
-  <export></export>
+  <depend>roscpp</depend>
+  <depend>dynamixel_workbench_msgs</depend>
+  <depend>dynamixel_workbench_toolbox</depend>
 </package>