Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: eProsima/ROS2-SH
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5c0807e7dbdd274253702fdf5ce1fb51efdf28ff
Choose a base ref
..
head repository: eProsima/ROS2-SH
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1377cfe5426c25855cc2b9bb318f6f69befd26a1
Choose a head ref
Showing with 380 additions and 620 deletions.
  1. +2 −2 .github/workflows/ci.yml
  2. +0 −5 ros2-test/colcon.pkg
  3. +0 −307 ros2-test/integration/ros2__test_msgs.cpp
  4. +0 −11 ros2-test/resources/ros2__test_msgs.yaml
  5. +9 −17 ros2/CMakeLists.txt
  6. 0 {ros2-test → ros2/test}/CHANGELOG.rst
  7. +6 −47 {ros2-test → ros2/test}/CMakeLists.txt
  8. 0 {ros2-test → ros2/test}/integration/ros2__geometry_msgs.cpp
  9. +341 −0 ros2/test/integration/ros2__primitives_msgs.cpp
  10. 0 {ros2-test → ros2/test}/integration/ros2__test_domain.cpp
  11. 0 {ros2-test → ros2/test}/integration/ros2__test_domain__foxy.cpp
  12. 0 {ros2-test → ros2/test}/resources/ros2__domain_change.yaml
  13. 0 {ros2-test → ros2/test}/resources/ros2__geometry_msgs.yaml
  14. 0 {ros2-test → ros2/test}/resources/ros2__websocket__test.yaml
  15. +19 −3 utils/ros2-mix-generator/CMakeLists.txt
  16. +2 −2 utils/{rosidl → ros2-mix-generator}/cmake/is_ros2_rosidl_mix.cmake
  17. +1 −1 utils/ros2-mix-generator/colcon.pkg
  18. 0 {ros2 → utils/ros2-mix-generator}/resources/convert__msg.cpp.em
  19. 0 {ros2 → utils/ros2-mix-generator}/resources/convert__msg.hpp.em
  20. 0 {ros2 → utils/ros2-mix-generator}/resources/convert__srv.cpp.em
  21. 0 utils/{rosidl → ros2-mix-generator}/scripts/is_ros2_rosidl_find_package_info.py
  22. 0 utils/{rosidl → ros2-mix-generator}/scripts/is_ros2_rosidl_generate.py
  23. +0 −34 utils/ros2-test-msg/CMakeLists.txt
  24. +0 −1 utils/ros2-test-msg/msg/BoundedArrayNested.msg
  25. +0 −14 utils/ros2-test-msg/msg/Primitives.msg
  26. +0 −20 utils/ros2-test-msg/package.xml
  27. +0 −9 utils/rosidl/CHANGELOG.rst
  28. +0 −73 utils/rosidl/CMakeLists.txt
  29. +0 −37 utils/rosidl/cmake/is_ros2_rosidl_install_extension.cmake
  30. +0 −37 utils/rosidl/is-ros2-rosidlConfig.cmake
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ on:
- '**.md'
- 'docs/**'
- 'ros2/docs/**'

jobs:
ros2-sh_CI:
strategy:
@@ -46,5 +46,5 @@ jobs:
- name: Test
run: |
. /opt/ros/${{ matrix.node }}/setup.sh && . install/local_setup.sh && colcon test --packages-up-to is-ros2-test --event-handlers console_direct+
. /opt/ros/${{ matrix.node }}/setup.sh && . install/local_setup.sh && colcon test --packages-select is-ros2 --event-handlers console_direct+
colcon test-result
5 changes: 0 additions & 5 deletions ros2-test/colcon.pkg

This file was deleted.

307 changes: 0 additions & 307 deletions ros2-test/integration/ros2__test_msgs.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions ros2-test/resources/ros2__test_msgs.yaml

This file was deleted.

26 changes: 9 additions & 17 deletions ros2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -65,7 +65,6 @@ if(BUILD_LIBRARY)
message(STATUS "Compiling the ${PROJECT_NAME} System Handle for ROS 2 ${IS_ROS2_DISTRO}...")

find_package(is-core REQUIRED)
find_package(is-ros2-rosidl REQUIRED)
find_package(rclcpp REQUIRED)
endif()

@@ -150,28 +149,21 @@ if(BUILD_LIBRARY)
rclcpp
)

install(
DIRECTORY
file(
COPY
${CMAKE_CURRENT_LIST_DIR}/include/
DESTINATION
${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT
${PROJECT_NAME}
)
${CMAKE_INSTALL_PREFIX}/include/
)
endif()

###################################################################################
# Install the Integration Service is-ros2-rosidl-mix plugin
# Integration Service ROS 2 SystemHandle tests
###################################################################################
if(BUILD_LIBRARY)
is_ros2_rosidl_install_extension(
MIDDLEWARE
ros2
MESSAGE
SOURCES "${CMAKE_CURRENT_LIST_DIR}/resources/convert__msg.cpp.em"
HEADERS "${CMAKE_CURRENT_LIST_DIR}/resources/convert__msg.hpp.em"
SERVICE
SOURCES "${CMAKE_CURRENT_LIST_DIR}/resources/convert__srv.cpp.em"
)
if(BUILD_TESTS OR BUILD_ROS2_TESTS)
add_subdirectory(test)
endif()
endif()

###################################################################################
File renamed without changes.
Loading