Update package to format 2.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9a3f59c..6b38f0c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ add_compile_options(-std=c++11)
 find_package(catkin REQUIRED COMPONENTS
   angles
   control_toolbox
 find_package(catkin REQUIRED COMPONENTS
   angles
   control_toolbox

-#  gazebo
+  electrical_interface

   gazebo_ros_control
   hardware_interface
   joint_limits_interface
   gazebo_ros_control
   hardware_interface
   joint_limits_interface


@@ -18,7 +18,6 @@ find_package(catkin REQUIRED COMPONENTS
   roscpp
   transmission_interface
   urdf
   roscpp
   transmission_interface
   urdf

-  electrical_interface

 )
 
 ## System dependencies are found with CMake's conventions
 )
 
 ## System dependencies are found with CMake's conventions


@@ -41,10 +40,10 @@ find_package(gazebo REQUIRED)
 ##   your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
 ## * In the file package.xml:
 ##   * add a build_depend tag for "message_generation"
 ##   your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
 ## * In the file package.xml:
 ##   * add a build_depend tag for "message_generation"

-##   * add a build_depend and a run_depend tag for each package in MSG_DEP_SET
+##   * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET

 ##   * If MSG_DEP_SET isn't empty the following dependency has been pulled in
 ##     but can be declared for certainty nonetheless:
 ##   * If MSG_DEP_SET isn't empty the following dependency has been pulled in
 ##     but can be declared for certainty nonetheless:

-##     * add a run_depend tag for "message_runtime"
+##     * add a exec_depend tag for "message_runtime"

 ## * In this file (CMakeLists.txt):
 ##   * add "message_generation" and every package in MSG_DEP_SET to
 ##     find_package(catkin REQUIRED COMPONENTS ...)
 ## * In this file (CMakeLists.txt):
 ##   * add "message_generation" and every package in MSG_DEP_SET to
 ##     find_package(catkin REQUIRED COMPONENTS ...)


@@ -89,7 +88,7 @@ find_package(gazebo REQUIRED)
 ## To declare and build dynamic reconfigure parameters within this
 ## package, follow these steps:
 ## * In the file package.xml:
 ## To declare and build dynamic reconfigure parameters within this
 ## package, follow these steps:
 ## * In the file package.xml:

-##   * add a build_depend and a run_depend tag for "dynamic_reconfigure"
+##   * add a build_depend and a exec_depend tag for "dynamic_reconfigure"

 ## * In this file (CMakeLists.txt):
 ##   * add "dynamic_reconfigure" to
 ##     find_package(catkin REQUIRED COMPONENTS ...)
 ## * In this file (CMakeLists.txt):
 ##   * add "dynamic_reconfigure" to
 ##     find_package(catkin REQUIRED COMPONENTS ...)


@@ -107,16 +106,15 @@ find_package(gazebo REQUIRED)
 ###################################
 ## The catkin_package macro generates cmake config files for your package
 ## Declare things to be passed to dependent projects
 ###################################
 ## The catkin_package macro generates cmake config files for your package
 ## Declare things to be passed to dependent projects

-## INCLUDE_DIRS: uncomment this if you package contains header files
+## INCLUDE_DIRS: uncomment this if your package contains header files

 ## LIBRARIES: libraries you create in this project that dependent projects also need
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
   INCLUDE_DIRS include
 ## LIBRARIES: libraries you create in this project that dependent projects also need
 ## CATKIN_DEPENDS: catkin_packages dependent projects also need
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
   INCLUDE_DIRS include

-  LIBRARIES ${PROJECT_NAME}
-  CATKIN_DEPENDS angles control_toolbox hardware_interface joint_limits_interface pluginlib roscpp transmission_interface urdf electrical_interface
-  # gazebo
-#  DEPENDS system_lib
+  LIBRARIES gazebo_ros_electrical
+  CATKIN_DEPENDS angles control_toolbox electrical_interface gazebo_ros_control hardware_interface joint_limits_interface pluginlib roscpp transmission_interface urdf
+  DEPENDS GAZEBO

 )
 
 ###########
 )
 
 ###########


@@ -126,8 +124,9 @@ catkin_package(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 include_directories(
 ## Specify additional locations of header files
 ## Your package locations should be listed before other locations
 include_directories(

-  include
+ include

   ${catkin_INCLUDE_DIRS}
   ${catkin_INCLUDE_DIRS}

+# TODO: Check names of system library include directories (gazebo)

   ${GAZEBO_INCLUDE_DIRS}
 )
 
   ${GAZEBO_INCLUDE_DIRS}
 )
 


@@ -159,6 +158,7 @@ add_library(${PROJECT_NAME}
 ## Specify libraries to link a library or executable target against
 target_link_libraries(${PROJECT_NAME}
    ${catkin_LIBRARIES}
 ## Specify libraries to link a library or executable target against
 target_link_libraries(${PROJECT_NAME}
    ${catkin_LIBRARIES}

+   ${GAZEBO_LIBRARIES}

 )
 
 #############
 )
 
 #############


@@ -190,9 +190,10 @@ install(DIRECTORY include/${PROJECT_NAME}/
 )
 
 ## Mark other files for installation (e.g. launch and bag files, etc.)
 )
 
 ## Mark other files for installation (e.g. launch and bag files, etc.)

-install(FILES gazebo_ros_electrical_plugins.xml
+install(FILES 

 #   # myfile1
 #   # myfile2
 #   # myfile1
 #   # myfile2

+   gazebo_ros_electrical_plugins.xml

    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
    DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 

diff --git a/package.xml b/package.xml
index 9c26011..eb98c61 100644 (file)
--- a/package.xml
+++ b/package.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
 <?xml version="1.0"?>

-<package>
+<package format="2">

   <name>gazebo_ros_electrical</name>
   <version>0.1.0</version>
   <description>The gazebo_ros_electrical package</description>
   <name>gazebo_ros_electrical</name>
   <version>0.1.0</version>
   <description>The gazebo_ros_electrical package</description>


@@ -29,20 +29,30 @@
   <author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
 
 
   <author email="fetter@ece.ufrgs.br">Walter Fetter Lages</author>
 
 

-  <!-- The *_depend tags are used to specify dependencies -->
+  <!-- The *depend tags are used to specify dependencies -->

   <!-- Dependencies can be catkin packages or system dependencies -->
   <!-- Examples: -->
   <!-- Dependencies can be catkin packages or system dependencies -->
   <!-- Examples: -->

+  <!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
+  <!--   <depend>roscpp</depend> -->
+  <!--   Note that this is equivalent to the following: -->
+  <!--   <build_depend>roscpp</build_depend> -->
+  <!--   <exec_depend>roscpp</exec_depend> -->

   <!-- Use build_depend for packages you need at compile time: -->
   <!--   <build_depend>message_generation</build_depend> -->
   <!-- Use build_depend for packages you need at compile time: -->
   <!--   <build_depend>message_generation</build_depend> -->

+  <!-- Use build_export_depend for packages you need in order to build against this package: -->
+  <!--   <build_export_depend>message_generation</build_export_depend> -->

   <!-- Use buildtool_depend for build tool packages: -->
   <!--   <buildtool_depend>catkin</buildtool_depend> -->
   <!-- Use buildtool_depend for build tool packages: -->
   <!--   <buildtool_depend>catkin</buildtool_depend> -->

-  <!-- Use run_depend for packages you need at runtime: -->
-  <!--   <run_depend>message_runtime</run_depend> -->
+  <!-- Use exec_depend for packages you need at runtime: -->
+  <!--   <exec_depend>message_runtime</exec_depend> -->

   <!-- Use test_depend for packages you need only for testing: -->
   <!--   <test_depend>gtest</test_depend> -->
   <!-- Use test_depend for packages you need only for testing: -->
   <!--   <test_depend>gtest</test_depend> -->

+  <!-- Use doc_depend for packages you need only for building documentation: -->
+  <!--   <doc_depend>doxygen</doc_depend> -->

   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>angles</build_depend>
   <build_depend>control_toolbox</build_depend>
   <buildtool_depend>catkin</buildtool_depend>
   <build_depend>angles</build_depend>
   <build_depend>control_toolbox</build_depend>

+  <build_depend>electrical_interface</build_depend>

   <build_depend>gazebo</build_depend>
   <build_depend>gazebo_ros_control</build_depend>
   <build_depend>hardware_interface</build_depend>
   <build_depend>gazebo</build_depend>
   <build_depend>gazebo_ros_control</build_depend>
   <build_depend>hardware_interface</build_depend>


@@ -51,18 +61,28 @@
   <build_depend>roscpp</build_depend>
   <build_depend>transmission_interface</build_depend>
   <build_depend>urdf</build_depend>
   <build_depend>roscpp</build_depend>
   <build_depend>transmission_interface</build_depend>
   <build_depend>urdf</build_depend>

-  <build_depend>electrical_interface</build_depend>
-  <run_depend>angles</run_depend>
-  <run_depend>control_toolbox</run_depend>
-  <run_depend>gazebo</run_depend>
-  <run_depend>gazebo_ros_control</run_depend>
-  <run_depend>hardware_interface</run_depend>
-  <run_depend>joint_limits_interface</run_depend>
-  <run_depend>pluginlib</run_depend>
-  <run_depend>roscpp</run_depend>
-  <run_depend>transmission_interface</run_depend>
-  <run_depend>urdf</run_depend>
-  <run_depend>electrical_interface</run_depend>
+  <build_export_depend>angles</build_export_depend>
+  <build_export_depend>control_toolbox</build_export_depend>
+  <build_export_depend>electrical_interface</build_export_depend>
+  <build_export_depend>gazebo</build_export_depend>
+  <build_export_depend>gazebo_ros_control</build_export_depend>
+  <build_export_depend>hardware_interface</build_export_depend>
+  <build_export_depend>joint_limits_interface</build_export_depend>
+  <build_export_depend>pluginlib</build_export_depend>
+  <build_export_depend>roscpp</build_export_depend>
+  <build_export_depend>transmission_interface</build_export_depend>
+  <build_export_depend>urdf</build_export_depend>
+  <exec_depend>angles</exec_depend>
+  <exec_depend>control_toolbox</exec_depend>
+  <exec_depend>electrical_interface</exec_depend>
+  <exec_depend>gazebo</exec_depend>
+  <exec_depend>gazebo_ros_control</exec_depend>
+  <exec_depend>hardware_interface</exec_depend>
+  <exec_depend>joint_limits_interface</exec_depend>
+  <exec_depend>pluginlib</exec_depend>
+  <exec_depend>roscpp</exec_depend>
+  <exec_depend>transmission_interface</exec_depend>
+  <exec_depend>urdf</exec_depend>

 
 
   <!-- The export tag contains other, unspecified, tags -->
 
 
   <!-- The export tag contains other, unspecified, tags -->