Imported upstream version '3.6.0' of 'upstream'

ros2-gbp · Aug 22, 2023 · 5de80bb · 5de80bb
1 parent f9eadf3
commit 5de80bb
Show file tree

Hide file tree

Showing 41 changed files with 104 additions and 246 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -7,10 +7,12 @@ jobs:
     strategy:
       matrix:
         env:
-          - {ROS_DISTRO: foxy, ROS_REPO: testing}
-          - {ROS_DISTRO: foxy, ROS_REPO: main}
           - {ROS_DISTRO: humble, ROS_REPO: testing}
           - {ROS_DISTRO: humble, ROS_REPO: main}
+          - {ROS_DISTRO: iron, ROS_REPO: testing}
+          - {ROS_DISTRO: iron, ROS_REPO: main}
+          - {ROS_DISTRO: rolling, ROS_REPO: testing}
+          - {ROS_DISTRO: rolling, ROS_REPO: main}
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1

diff --git a/swri_cli_tools/CHANGELOG.rst b/swri_cli_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_cli_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_cli_tools/package.xml b/swri_cli_tools/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>swri_cli_tools</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>Command line tools for introspecting ROS systems</description>
   <maintainer email="[email protected]">Southwest Research Institute</maintainer>
   <author email="[email protected]">David Anthony</author>

diff --git a/swri_cli_tools/setup.py b/swri_cli_tools/setup.py
@@ -5,7 +5,7 @@
 
 setup(
     name=package_name,
-    version='3.5.4',
+    version='3.6.0',
     packages=find_packages(exclude=['test']),
     data_files=[
         ('share/' + package_name, ['package.xml']),

diff --git a/swri_console_util/CHANGELOG.rst b/swri_console_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_console_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_console_util/package.xml b/swri_console_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_console_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_console_util

diff --git a/swri_dbw_interface/CHANGELOG.rst b/swri_dbw_interface/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_dbw_interface
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_dbw_interface/package.xml b/swri_dbw_interface/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="3">
   <name>swri_dbw_interface</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
     This package provides documentation on common interface conventions for
     drive-by-wire systems.

diff --git a/swri_geometry_util/CHANGELOG.rst b/swri_geometry_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_geometry_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_geometry_util/package.xml b/swri_geometry_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_geometry_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_geometry_util

diff --git a/swri_image_util/CHANGELOG.rst b/swri_image_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_image_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_image_util/package.xml b/swri_image_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_image_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_image_util

diff --git a/swri_math_util/CHANGELOG.rst b/swri_math_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_math_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_math_util/package.xml b/swri_math_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_math_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_math_util

diff --git a/swri_opencv_util/CHANGELOG.rst b/swri_opencv_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_opencv_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_opencv_util/package.xml b/swri_opencv_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_opencv_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_opencv_util

diff --git a/swri_prefix_tools/CHANGELOG.rst b/swri_prefix_tools/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_prefix_tools
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_prefix_tools/package.xml b/swri_prefix_tools/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_prefix_tools</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
     Contains scripts that are useful as prefix commands for nodes

diff --git a/swri_roscpp/CHANGELOG.rst b/swri_roscpp/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package swri_roscpp
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+* Rolling updates (`#715 <https://github.com/swri-robotics/marti_common/issues/715>`_)
+  - Updating code for Rolling.
+  - Removing conditional compilation code related to EOL distributions.
+* Contributors: David Anthony
+
 3.5.4 (2023-08-14)
 ------------------
 * Add publisher and subscription options to constructors (`#714 <https://github.com/swri-robotics/marti_common/issues/714>`_)

diff --git a/swri_roscpp/CMakeLists.txt b/swri_roscpp/CMakeLists.txt
@@ -4,11 +4,7 @@ project(swri_roscpp)
 
 # Default to C++ version appropriate for the ROS distribution
 if(NOT CMAKE_CXX_STANDARD)
-  if ("$ENV{ROS_DISTRO}" STRGREATER "foxy")
     set(CMAKE_CXX_STANDARD 17) 
-  else()
-    set(CMAKE_CXX_STANDARD 14) 
-  endif()
 endif()
 if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   add_compile_options(-Wall -Wextra -Wpedantic)
@@ -24,44 +20,35 @@ find_package(rosidl_default_generators REQUIRED)
 find_package(std_msgs REQUIRED)
 find_package(std_srvs REQUIRED)
 
-# How we build header only libraries changed in Humble
-if("$ENV{ROS_DISTRO}" STRGREATER "galactic")
-  add_library(${PROJECT_NAME}_library INTERFACE)
+add_library(${PROJECT_NAME}_library INTERFACE)
 
-  target_link_libraries(${PROJECT_NAME}_library INTERFACE
-    ${diagnostic_updater_LIBRARIES}
-    ${rclcpp_LIBRARIES}
-    ${std_msgs_LIBRARIES}
-  )
-  target_include_directories(${PROJECT_NAME}_library INTERFACE
-    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
-    "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
-    ${diagnostic_updater_INCLUDE_DIRS}
-    ${rclcpp_INCLUDE_DIRS}
-    ${std_msgs_INCLUDE_DIRS}
-  )
-
-  install(DIRECTORY include/
-    DESTINATION include/${PROJECT_NAME}
-  )
-  install(TARGETS ${PROJECT_NAME}_library
-    EXPORT export_${PROJECT_NAME}
-  )
+target_link_libraries(${PROJECT_NAME}_library INTERFACE
+  ${diagnostic_updater_LIBRARIES}
+  ${rclcpp_LIBRARIES}
+  ${std_msgs_LIBRARIES}
+)
+target_include_directories(${PROJECT_NAME}_library INTERFACE
+  "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+  "$<INSTALL_INTERFACE:include/${PROJECT_NAME}>"
+  ${diagnostic_updater_INCLUDE_DIRS}
+  ${rclcpp_INCLUDE_DIRS}
+  ${std_msgs_INCLUDE_DIRS}
+)
 
-  # Export old-style CMake variables
-  ament_export_include_directories("include/${PROJECT_NAME}")
+install(DIRECTORY include/
+  DESTINATION include/${PROJECT_NAME}
+)
+install(TARGETS ${PROJECT_NAME}_library
+  EXPORT export_${PROJECT_NAME}
+)
 
-  # Export modern CMake targets
-  ament_export_targets(export_${PROJECT_NAME})
+# Export old-style CMake variables
+ament_export_include_directories("include/${PROJECT_NAME}")
 
-  # Only test on Humble or newer until https://github.com/ros2/rosidl/pull/639 is merged
-  include(cmake/swri_roscpp-test.cmake)
-else()
-  install(DIRECTORY include/${PROJECT_NAME}/
-    DESTINATION include/${PROJECT_NAME}
-  )
-  ament_export_include_directories(include)
-endif()
+# Export modern CMake targets
+ament_export_targets(export_${PROJECT_NAME})
+
+include(cmake/swri_roscpp-test.cmake)
 
 add_executable(subscriber_test src/nodes/subscriber_test.cpp)
 target_include_directories(subscriber_test

diff --git a/swri_roscpp/package.xml b/swri_roscpp/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" ?>
 <package format="3">
   <name>swri_roscpp</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_roscpp

diff --git a/swri_route_util/CHANGELOG.rst b/swri_route_util/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package swri_route_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+* Rolling updates (`#715 <https://github.com/swri-robotics/marti_common/issues/715>`_)
+  - Updating code for Rolling.
+  - Removing conditional compilation code related to EOL distributions.
+* Contributors: David Anthony
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_route_util/CMakeLists.txt b/swri_route_util/CMakeLists.txt
@@ -29,11 +29,6 @@ target_include_directories(${PROJECT_NAME}
 )
 set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
-if ("$ENV{ROS_DISTRO}" STRLESS_EQUAL "galactic")
-  target_compile_definitions(${PROJECT_NAME}
-    PRIVATE "-DUSE_TF2_H_FILES")
-endif()
-
 ament_target_dependencies(${PROJECT_NAME}
   PUBLIC
   ament_cmake

diff --git a/swri_route_util/include/swri_route_util/route_point_inline.h b/swri_route_util/include/swri_route_util/route_point_inline.h
@@ -31,11 +31,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-#ifdef USE_TF2_H_FILES
-#include <tf2_geometry_msgs/tf2_geometry_msgs.h>
-#else
 #include <tf2_geometry_msgs/tf2_geometry_msgs.hpp>
-#endif
 
 namespace swri_route_util
 {

diff --git a/swri_route_util/package.xml b/swri_route_util/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>swri_route_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
 
   <description>
     This library provides functionality to simplify working with the

diff --git a/swri_serial_util/CHANGELOG.rst b/swri_serial_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_serial_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_serial_util/package.xml b/swri_serial_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_serial_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_serial_util

diff --git a/swri_system_util/CHANGELOG.rst b/swri_system_util/CHANGELOG.rst
@@ -2,6 +2,9 @@
 Changelog for package swri_system_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+
 3.5.4 (2023-08-14)
 ------------------
 

diff --git a/swri_system_util/package.xml b/swri_system_util/package.xml
@@ -1,6 +1,6 @@
 <package format="3">
   <name>swri_system_util</name>
-  <version>3.5.4</version>
+  <version>3.6.0</version>
   <description>
 
      swri_system_util

diff --git a/swri_transform_util/CHANGELOG.rst b/swri_transform_util/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package swri_transform_util
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+3.6.0 (2023-08-22)
+------------------
+* Rolling updates (`#715 <https://github.com/swri-robotics/marti_common/issues/715>`_)
+  - Updating code for Rolling.
+  - Removing conditional compilation code related to EOL distributions.
+* Contributors: David Anthony
+
 3.5.4 (2023-08-14)
 ------------------