Port to Noetic.

diff --git a/twil/package.xml b/twil/package.xml
index 7219538..645fd5f 100644 (file)
--- a/twil/package.xml
+++ b/twil/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>twil</name>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
   <description>The twil package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
@@ -20,7 +20,6 @@
   <!-- Optional attribute type can be: website, bugtracker, or repository -->
   <!-- Example: -->
   <!-- <url type="website">http://wiki.ros.org/twil</url> -->
-  <url type="website">http://www.ece.ufrgs.br/~fetter/twil</url>
 
 
   <!-- Author tags are optional, multiple are allowed, one per tag -->
@@ -51,7 +50,14 @@
   <!-- Use doc_depend for packages you need only for building documentation: -->
   <!--   <doc_depend>doxygen</doc_depend> -->
   <buildtool_depend>catkin</buildtool_depend>
-
+  <build_depend>twil_bringup</build_depend>
+  <build_depend>twil_description</build_depend>
+  <build_depend>twil_gazebo_ros_control</build_depend>
+  <build_depend>twil_ident</build_depend>
+  <build_export_depend>twil_bringup</build_export_depend>
+  <build_export_depend>twil_description</build_export_depend>
+  <build_export_depend>twil_gazebo_ros_control</build_export_depend>
+  <build_export_depend>twil_ident</build_export_depend>
   <exec_depend>twil_bringup</exec_depend>
   <exec_depend>twil_description</exec_depend>
   <exec_depend>twil_gazebo_ros_control</exec_depend>

diff --git a/twil_bringup/CMakeLists.txt b/twil_bringup/CMakeLists.txt
index 292572a..d4f221d 100644 (file)
--- a/twil_bringup/CMakeLists.txt
+++ b/twil_bringup/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(twil_bringup)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -7,7 +7,12 @@ project(twil_bringup)
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
-find_package(catkin REQUIRED)
+find_package(catkin REQUIRED COMPONENTS
+  controller_manager
+  effort_controllers
+  joint_state_controller
+  twil_description
+)
 
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
@@ -101,7 +106,7 @@ find_package(catkin REQUIRED)
 catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES twil_bringup
-#  CATKIN_DEPENDS other_catkin_pkg
+#  CATKIN_DEPENDS controller_manager effort_controllers joint_state_controller twil_description
 #  DEPENDS system_lib
 )
 
@@ -113,7 +118,7 @@ catkin_package(
 ## Your package locations should be listed before other locations
 include_directories(
 # include
-# ${catkin_INCLUDE_DIRS}
+  ${catkin_INCLUDE_DIRS}
 )
 
 ## Declare a C++ library
@@ -155,16 +160,23 @@ include_directories(
 
 ## Mark executable scripts (Python etc.) for installation
 ## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
+# catkin_install_python(PROGRAMS
 #   scripts/my_python_script
 #   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 # )
 
-## Mark executables and/or libraries for installation
-# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
+## Mark executables for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
+# install(TARGETS ${PROJECT_NAME}_node
+#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark libraries for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+# install(TARGETS ${PROJECT_NAME}
 #   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 #   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
 # )
 
 ## Mark cpp header files for installation

diff --git a/twil_bringup/package.xml b/twil_bringup/package.xml
index 325399d..9d01932 100644 (file)
--- a/twil_bringup/package.xml
+++ b/twil_bringup/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>twil_bringup</name>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
   <description>The twil_bringup package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->
@@ -67,5 +67,6 @@
   <!-- The export tag contains other, unspecified, tags -->
   <export>
     <!-- Other tools can request additional information be placed here -->
+
   </export>
 </package>

diff --git a/twil_description/CMakeLists.txt b/twil_description/CMakeLists.txt
index afb1ff5..0865541 100644 (file)
--- a/twil_description/CMakeLists.txt
+++ b/twil_description/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(twil_description)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -155,16 +155,23 @@ include_directories(
 
 ## Mark executable scripts (Python etc.) for installation
 ## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
+# catkin_install_python(PROGRAMS
 #   scripts/my_python_script
 #   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 # )
 
-## Mark executables and/or libraries for installation
-# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
+## Mark executables for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
+# install(TARGETS ${PROJECT_NAME}_node
+#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark libraries for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+# install(TARGETS ${PROJECT_NAME}
 #   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 #   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
 # )
 
 ## Mark cpp header files for installation

diff --git a/twil_description/package.xml b/twil_description/package.xml
index 13b2481..d8f9073 100644 (file)
--- a/twil_description/package.xml
+++ b/twil_description/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>twil_description</name>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
   <description>The twil_description package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->

diff --git a/twil_gazebo_ros_control/CMakeLists.txt b/twil_gazebo_ros_control/CMakeLists.txt
index abef828..d3ef2cb 100644 (file)
--- a/twil_gazebo_ros_control/CMakeLists.txt
+++ b/twil_gazebo_ros_control/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(twil_gazebo_ros_control)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -163,16 +163,23 @@ include_directories(
 
 ## Mark executable scripts (Python etc.) for installation
 ## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
+# catkin_install_python(PROGRAMS
 #   scripts/my_python_script
 #   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 # )
 
-## Mark executables and/or libraries for installation
-# install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_node
+## Mark executables for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
+# install(TARGETS ${PROJECT_NAME}_node
+#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+# )
+
+## Mark libraries for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+# install(TARGETS ${PROJECT_NAME}
 #   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 #   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
 # )
 
 ## Mark cpp header files for installation

diff --git a/twil_gazebo_ros_control/package.xml b/twil_gazebo_ros_control/package.xml
index 7723f91..4e646d9 100644 (file)
--- a/twil_gazebo_ros_control/package.xml
+++ b/twil_gazebo_ros_control/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>twil_gazebo_ros_control</name>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
   <description>The twil_gazebo_ros_control package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->

diff --git a/twil_ident/CMakeLists.txt b/twil_ident/CMakeLists.txt
index 6320929..d44d476 100644 (file)
--- a/twil_ident/CMakeLists.txt
+++ b/twil_ident/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(twil_ident)
 
 ## Compile as C++11, supported in ROS Kinetic and newer
@@ -108,7 +108,7 @@ catkin_package(
 #  INCLUDE_DIRS include
 #  LIBRARIES twil_ident
 #  CATKIN_DEPENDS kdl_parser roscpp
-#   DEPENDS Eigen3
+#  DEPENDS Eigen3
 )
 
 ###########
@@ -121,7 +121,7 @@ include_directories(
  include
   ${catkin_INCLUDE_DIRS}
 # TODO: Check names of system library include directories (Eigen3)
-  ${Eigen3_INCLUDE_DIRS}
+  ${EIGEN3_INCLUDE_DIRS}
 )
 
 ## Declare a C++ library
@@ -164,18 +164,25 @@ target_link_libraries(ident
 
 ## Mark executable scripts (Python etc.) for installation
 ## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
+# catkin_install_python(PROGRAMS
 #   scripts/my_python_script
 #   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 # )
 
-## Mark executables and/or libraries for installation
+## Mark executables for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
 install(TARGETS ident
-#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
    RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 
+## Mark libraries for installation
+## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
+# install(TARGETS ${PROJECT_NAME}
+#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+#   RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
+# )
+
 ## Mark cpp header files for installation
 # install(DIRECTORY include/${PROJECT_NAME}/
 #   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}

diff --git a/twil_ident/package.xml b/twil_ident/package.xml
index 7ad62ce..7000c1e 100644 (file)
--- a/twil_ident/package.xml
+++ b/twil_ident/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>twil_ident</name>
-  <version>4.0.0</version>
+  <version>4.1.0</version>
   <description>The twil_ident package</description>
 
   <!-- One maintainer tag required, multiple allowed, one person per tag -->