Fix catkin lint errors (#296)

ros-drivers · Nov 6, 2017 · d7e08ea · d7e08ea
1 parent 979bae6
commit d7e08ea
Show file tree

Hide file tree

Showing 32 changed files with 148 additions and 103 deletions.
diff --git a/rosserial_arduino/CMakeLists.txt b/rosserial_arduino/CMakeLists.txt
@@ -1,34 +1,36 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_arduino)
 
-find_package(catkin REQUIRED COMPONENTS message_generation)
+find_package(catkin REQUIRED COMPONENTS
+  message_generation
+)
 
 add_message_files(FILES
-                  Adc.msg
-                 )
+  Adc.msg
+)
 
 add_service_files(FILES
-                  Test.srv
-                 )
+  Test.srv
+)
 
 generate_messages()
 
 catkin_package(
   CATKIN_DEPENDS message_runtime
-  CFG_EXTRAS rosserial_arduino-extras.cmake
+  CFG_EXTRAS ${PROJECT_NAME}-extras.cmake
 )
 
-install(DIRECTORY src/ros_lib
+install(
+  DIRECTORY src/ros_lib
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
 )
 
-install(DIRECTORY arduino-cmake
+install(
+  DIRECTORY arduino-cmake
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
 
-install(PROGRAMS src/rosserial_arduino/make_libraries.py
+catkin_install_python(
+  PROGRAMS src/${PROJECT_NAME}/make_libraries.py
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )
-
-
-
diff --git a/rosserial_arduino/package.xml b/rosserial_arduino/package.xml
@@ -2,7 +2,7 @@
   <name>rosserial_arduino</name>
   <version>0.7.6</version>
   <description>
-    Libraries and examples for ROSserial usage on Arduino/AVR Platforms.
+    rosserial for Arduino/AVR platforms.
   </description>
   <author>Michael Ferguson</author>
   <author>Adam Stambler</author>

diff --git a/rosserial_arduino/src/ros_lib/examples/ServiceClient/client.py b/rosserial_arduino/src/ros_lib/examples/ServiceClient/client.py
diff --git a/rosserial_client/CMakeLists.txt b/rosserial_client/CMakeLists.txt
@@ -3,21 +3,29 @@ project(rosserial_client)
 
 find_package(catkin REQUIRED)
 catkin_package(
-  CFG_EXTRAS rosserial_client-extras.cmake
+  CFG_EXTRAS ${PROJECT_NAME}-extras.cmake
 )
 
 catkin_python_setup()
 
-install(DIRECTORY src/ros_lib
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
-)
-install(PROGRAMS scripts/make_libraries
-  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-)
-
 if(CATKIN_ENABLE_TESTING)
   find_package(rosserial_msgs REQUIRED)
   include_directories(src ${rosserial_msgs_INCLUDE_DIRS})
   catkin_add_gtest(float64_test test/float64_test.cpp)
   catkin_add_gtest(subscriber_test test/subscriber_test.cpp)
 endif()
+
+install(
+  DIRECTORY src/ros_lib
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
+)
+
+install(
+  PROGRAMS scripts/make_libraries
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+catkin_install_python(
+  PROGRAMS src/${PROJECT_NAME}/make_library.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/rosserial_client/cmake/rosserial_client-extras.cmake b/rosserial_client/cmake/rosserial_client-extras.cmake
@@ -13,7 +13,7 @@ cmake_minimum_required(VERSION 2.8.3)
 # @public
 #
 function(rosserial_generate_ros_lib)
-  cmake_parse_arguments(make_libraries "" "PACKAGE;SCRIPT" "" ${ARGN}) 
+  cmake_parse_arguments(make_libraries "" "PACKAGE;SCRIPT" "" ${ARGN})
   if(NOT make_libraries_PACKAGE)
     set(make_libraries_PACKAGE rosserial_client)
   endif()

diff --git a/rosserial_client/package.xml b/rosserial_client/package.xml
@@ -19,5 +19,6 @@
   <exec_depend>rospy</exec_depend>
   <exec_depend>tf</exec_depend>
 
+  <test_depend>rosunit</test_depend>
   <test_depend>rosserial_msgs</test_depend>
 </package>
diff --git a/rosserial_embeddedlinux/CMakeLists.txt b/rosserial_embeddedlinux/CMakeLists.txt
@@ -1,17 +1,18 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_embeddedlinux)
 
-find_package(catkin REQUIRED)
-catkin_package(CATKIN_DEPENDS)
-
-install(DIRECTORY src/ros_lib
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
+find_package(catkin REQUIRED COMPONENTS
+  rosserial_client
 )
 
-install(DIRECTORY src/examples
+catkin_package(CATKIN_DEPENDS)
+
+install(
+  DIRECTORY src/ros_lib
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
 )
 
-install(PROGRAMS src/rosserial_embeddedlinux/make_libraries.py
-  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+catkin_install_python(
+  PROGRAMS src/${PROJECT_NAME}/make_libraries.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
diff --git a/rosserial_embeddedlinux/package.xml b/rosserial_embeddedlinux/package.xml
@@ -2,7 +2,7 @@
   <name>rosserial_embeddedlinux</name>
   <version>0.7.6</version>
   <description>
-    Libraries and examples for ROSserial usage on Embedded Linux Enviroments
+    rosserial for embedded Linux enviroments
   </description>
   <author>Paul Bouchier</author>
   <maintainer email="paul.bouchier@gmail.com">Paul Bouchier</maintainer>
@@ -12,10 +12,6 @@
 
   <buildtool_depend>catkin</buildtool_depend>
 
-  <build_depend>std_msgs</build_depend>
-  <build_depend>sensor_msgs</build_depend>
-  <build_depend>geometry_msgs</build_depend>
-  <build_depend>nav_msgs</build_depend>
   <build_depend>rosserial_client</build_depend>
 
   <run_depend>rospy</run_depend>

diff --git a/rosserial_embeddedlinux/src/examples/ExampleService/ExampleService.cpp b/rosserial_embeddedlinux/src/examples/ExampleService/ExampleService.cpp
diff --git a/rosserial_embeddedlinux/src/examples/ExampleServiceClient/ExampleServiceClient.cpp b/rosserial_embeddedlinux/src/examples/ExampleServiceClient/ExampleServiceClient.cpp
diff --git a/rosserial_embeddedlinux/src/examples/ExampleServiceClient/exampleService.py b/rosserial_embeddedlinux/src/examples/ExampleServiceClient/exampleService.py
diff --git a/rosserial_embeddedlinux/src/examples/ExampleSubscriber/ExampleSubscriber.cpp b/rosserial_embeddedlinux/src/examples/ExampleSubscriber/ExampleSubscriber.cpp
diff --git a/rosserial_embeddedlinux/src/examples/HelloRos/HelloROS.cpp b/rosserial_embeddedlinux/src/examples/HelloRos/HelloROS.cpp
diff --git a/rosserial_embeddedlinux/src/examples/VEXProMotor13Subscribe/VEXProMotor13Subscribe.cpp b/rosserial_embeddedlinux/src/examples/VEXProMotor13Subscribe/VEXProMotor13Subscribe.cpp
diff --git a/rosserial_embeddedlinux/src/examples/VEXProRangeMotorLoop/VEXProRangeMotorLoop.cpp b/rosserial_embeddedlinux/src/examples/VEXProRangeMotorLoop/VEXProRangeMotorLoop.cpp
diff --git a/rosserial_embeddedlinux/src/examples/VEXProRangePublish/VEXProRangePublish.cpp b/rosserial_embeddedlinux/src/examples/VEXProRangePublish/VEXProRangePublish.cpp
diff --git a/rosserial_embeddedlinux/src/examples/VEXProServoSubscribe/VEXProServoSubscribe.cpp b/rosserial_embeddedlinux/src/examples/VEXProServoSubscribe/VEXProServoSubscribe.cpp
diff --git a/rosserial_mbed/CMakeLists.txt b/rosserial_mbed/CMakeLists.txt
@@ -1,34 +1,30 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_mbed)
 
-find_package(catkin REQUIRED COMPONENTS message_generation)
+find_package(catkin REQUIRED COMPONENTS
+  message_generation
+)
 
 add_message_files(FILES
-                  Adc.msg
-                 )
+  Adc.msg
+)
 
 add_service_files(FILES
-                  Test.srv
-                 )
+  Test.srv
+)
 
 generate_messages()
 
-catkin_package(
-  CATKIN_DEPENDS message_runtime
-#  CFG_EXTRAS rosserial_mbed-extras.cmake
+catkin_package(CATKIN_DEPENDS
+  message_runtime
 )
 
-install(DIRECTORY src/ros_lib
+install(
+  DIRECTORY src/ros_lib
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/src
 )
 
-#install(DIRECTORY mbed-cmake
-#  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-#)
-
-#install(PROGRAMS src/rosserial_mbed/make_libraries.py
-#  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-#)
-
-
-
+catkin_install_python(
+  PROGRAMS src/${PROJECT_NAME}/make_libraries.py
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/rosserial_mbed/package.xml b/rosserial_mbed/package.xml
@@ -2,7 +2,7 @@
   <name>rosserial_mbed</name>
   <version>0.7.6</version>
   <description>
-    Libraries and examples for ROSserial usage on Mbed Platforms.
+    rosserial for mbed platforms.
   </description>
   <author>Gary Servin</author>
   <maintainer email="garyservin@gmail.com">Gary Servin</maintainer>

diff --git a/rosserial_mbed/src/examples/ServiceClient/client.py b/rosserial_mbed/src/examples/ServiceClient/client.py
diff --git a/rosserial_msgs/CMakeLists.txt b/rosserial_msgs/CMakeLists.txt
@@ -1,18 +1,23 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_msgs)
 
-find_package(catkin REQUIRED COMPONENTS message_generation)
+find_package(catkin REQUIRED COMPONENTS
+  message_generation
+)
 
 add_message_files(FILES
-                  Log.msg
-                  TopicInfo.msg
-                 )
+  Log.msg
+  TopicInfo.msg
+)
 
 add_service_files(FILES
-                  RequestParam.srv
-                  RequestMessageInfo.srv
-                  RequestServiceInfo.srv
-                 )
+  RequestMessageInfo.srv
+  RequestParam.srv
+  RequestServiceInfo.srv
+)
 
 generate_messages()
-catkin_package(CATKIN_DEPENDS message_runtime)
+
+catkin_package(CATKIN_DEPENDS
+  message_runtime
+)
diff --git a/rosserial_python/CMakeLists.txt b/rosserial_python/CMakeLists.txt
@@ -6,6 +6,7 @@ catkin_package()
 
 catkin_python_setup()
 
-install(PROGRAMS nodes/serial_node.py nodes/message_info_service.py
+catkin_install_python(
+  PROGRAMS nodes/message_info_service.py nodes/serial_node.py
   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
diff --git a/rosserial_python/package.xml b/rosserial_python/package.xml
@@ -2,7 +2,7 @@
   <name>rosserial_python</name>
   <version>0.7.6</version>
   <description>
-    A Python-based implementation of the ROS serial protocol.
+    A Python-based implementation of the rosserial protocol.
   </description>
   <author>Michael Ferguson</author>
   <maintainer email="paul.bouchier@gmail.com">Paul Bouchier</maintainer>

diff --git a/rosserial_server/CMakeLists.txt b/rosserial_server/CMakeLists.txt
@@ -1,18 +1,31 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_server)
 
-find_package(catkin REQUIRED COMPONENTS roscpp rosserial_msgs topic_tools)
-find_package(Boost REQUIRED COMPONENTS system thread)
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  rosserial_msgs
+  std_msgs
+  topic_tools
+)
+
+find_package(Boost REQUIRED COMPONENTS
+  system
+  thread
+)
 
 catkin_package(
   INCLUDE_DIRS include
-  CATKIN_DEPENDS roscpp rosserial_msgs topic_tools
+  CATKIN_DEPENDS
+    roscpp
+    rosserial_msgs
+    std_msgs
+    topic_tools
 )
 
 include_directories(
   include
-  ${Boost_INCLUDE_DIRS}
-  ${catkin_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
+    ${catkin_INCLUDE_DIRS}
 )
 
 add_executable(${PROJECT_NAME}_serial_node src/serial_node.cpp)
@@ -31,7 +44,10 @@ set_target_properties(${PROJECT_NAME}_udp_socket_node PROPERTIES OUTPUT_NAME udp
 add_dependencies(${PROJECT_NAME}_udp_socket_node ${catkin_EXPORTED_TARGETS})
 
 install(
-  TARGETS ${PROJECT_NAME}_serial_node ${PROJECT_NAME}_socket_node  ${PROJECT_NAME}_udp_socket_node
+  TARGETS
+    ${PROJECT_NAME}_serial_node
+    ${PROJECT_NAME}_socket_node
+    ${PROJECT_NAME}_udp_socket_node
   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
 )
 

diff --git a/rosserial_server/package.xml b/rosserial_server/package.xml
@@ -3,8 +3,8 @@
   <name>rosserial_server</name>
   <version>0.7.6</version>
   <description>
-    The rosserial_server package provides a C++ implementation of the rosserial server side,
-    serving as a more performance- and stability-oriented alternative to rosserial_python.
+    A more performance- and stability-oriented server alternative implemented
+    in C++ to rosserial_python.
   </description>
 
   <maintainer email="mpurvis@clearpathrobotics.com">Mike Purvis</maintainer>

diff --git a/rosserial_test/CMakeLists.txt b/rosserial_test/CMakeLists.txt
@@ -1,15 +1,27 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(rosserial_test)
 
-find_package(catkin REQUIRED COMPONENTS roscpp rosserial_client rosserial_msgs rosserial_python rosserial_server rostest std_msgs)
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  rosserial_client
+  rosserial_msgs
+  rosserial_python
+  rosserial_server
+  rostest
+  std_msgs
+)
 
-catkin_package()
+catkin_package(
+  CATKIN_DEPENDS
+  rosserial_msgs
+  std_msgs
+)
 
 if(CATKIN_ENABLE_TESTING)
   # Generate a client library for the test harnesses to use.
   add_custom_command(
     OUTPUT ${PROJECT_BINARY_DIR}/include/rosserial
-    COMMAND ${CATKIN_DEVEL_PREFIX}/env.sh rosrun rosserial_test generate_client_ros_lib ${PROJECT_BINARY_DIR}/include
+    COMMAND ${CATKIN_DEVEL_PREFIX}/env.sh rosrun ${PROJECT_NAME} generate_client_ros_lib ${PROJECT_BINARY_DIR}/include
   )
   add_custom_target(${PROJECT_NAME}_rosserial_lib DEPENDS ${PROJECT_BINARY_DIR}/include/rosserial)
   add_dependencies(${PROJECT_NAME}_rosserial_lib ${catkin_EXPORTED_TARGETS})
@@ -19,7 +31,7 @@ if(CATKIN_ENABLE_TESTING)
   )
 
   # Helper for building and linking test executables.
-  function(add_rosserial_test_executable test_source)
+  function(add_${PROJECT_NAME}_executable test_source)
     set(target ${PROJECT_NAME}_${test_source})
     add_executable(${target} EXCLUDE_FROM_ALL src/${test_source})
     add_dependencies(${target} ${PROJECT_NAME}_rosserial_lib)
@@ -35,3 +47,7 @@ if(CATKIN_ENABLE_TESTING)
   # Disabled due to reconnect logic in rosserial_python not being robust enough.
   # add_rostest(test/rosserial_python_serial.test)
 endif()
+
+catkin_install_python(PROGRAMS scripts/generate_client_ros_lib
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
diff --git a/rosserial_tivac/CMakeLists.txt b/rosserial_tivac/CMakeLists.txt
@@ -4,7 +4,7 @@ project(rosserial_tivac)
 find_package(catkin REQUIRED)
 
 catkin_package(
-  CFG_EXTRAS rosserial_tivac-extras.cmake
+  CFG_EXTRAS ${PROJECT_NAME}-extras.cmake
 )
 
 install(
@@ -20,8 +20,8 @@ install(
 )
 
 install(
-  PROGRAMS 
-    src/rosserial_tivac/make_libraries_tiva
-    src/rosserial_tivac/make_libraries_energia
+  PROGRAMS
+    src/${PROJECT_NAME}/make_libraries_energia
+    src/${PROJECT_NAME}/make_libraries_tiva
   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 )