Skip to content
This repository has been archived by the owner on Jun 21, 2023. It is now read-only.

Replace rosidl_generator_x for rosidl_runtime_x #399

Merged
merged 5 commits into from
Apr 10, 2020

Conversation

ahcorde
Copy link
Contributor

@ahcorde ahcorde commented Mar 24, 2020

This PR is related to the changes introduced in this PR ros2/rosidl#442. The full process can be followed here ros2/rosidl#443

rmw_connext is using rosidl_generator_c headers which are located here: rosidl_runtime_c

Example os file using these headers

#include "rosidl_generator_c/primitives_sequence_functions.h"

Signed-off-by: ahcorde ahcorde@gmail.com

Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor Author

ahcorde commented Mar 24, 2020

I made the change of rosidl_runtime_c to <depend> because it has a .so/.dylib/dll

@ahcorde
Copy link
Contributor Author

ahcorde commented Apr 3, 2020

For some reason this failure has appeared in the buildfarm https://ci.ros2.org/job/ci_linux/9920/console:

16:55:26 Traceback (most recent call last):
16:55:26   File "/home/jenkins-agent/workspace/ci_linux/ws/src/ros2/rmw_connext/rmw_connext_cpp/bin/apply-patch.py", line 80, in <module>
16:55:26     content_out = apply_patch(content_in, content_patch)
16:55:26   File "/home/jenkins-agent/workspace/ci_linux/ws/src/ros2/rmw_connext/rmw_connext_cpp/bin/apply-patch.py", line 60, in apply_patch
16:55:26     assert s[sl] == line[1:], \
16:55:26 AssertionError: s[323] '
16:55:26 ' != line[1:] '    NDDSUSERDllExport extern struct PRESTypePlugin*
16:55:26 '

this is the right patch 28b1b04:

--- a/rmw_connext_cpp/resources/patch_generated/connext_static_serialized_dataPlugin.h
+++ b/rmw_connext_cpp/resources/patch_generated/connext_static_serialized_dataPlugin.h
@@ -322,6 +322,9 @@
 NDDSUSERDllExport extern struct PRESTypePlugin*
 ConnextStaticSerializedDataPlugin_new(void);

+NDDSUSERDllExport extern struct PRESTypePlugin*
+ConnextStaticSerializedDataPlugin_new_external(struct DDS_TypeCode * external_type_code);
+
 NDDSUSERDllExport extern void
 ConnextStaticSerializedDataPlugin_delete(struct PRESTypePlugin *);

Any idea why is this happening? @dirk-thomas @Karsten1987 ?

@ahcorde
Copy link
Contributor Author

ahcorde commented Apr 3, 2020

By the way I know this an unrelated change, I can split this new change in a new PR

@dirk-thomas
Copy link
Member

By the way I know this an unrelated change, I can split this new change in a new PR

Then please do separate it. This has nothing to do with the topic of this PR.

Signed-off-by: ahcorde <ahcorde@gmail.com>
@ahcorde
Copy link
Contributor Author

ahcorde commented Apr 10, 2020

  • Updated all repos involved in this change.
  • Skipping ros1_bridge, qt_*, rqt_*, and rviz_* packages.
  • Testing against test_rclcpp and rosbag2_tests.
  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status
  • One warning made the builds unstable but there is a (PR pending)
CMake Deprecation Warning at /home/jenkins-agent/workspace/ci_linux-aarch64/ws/install/ament_cmake_export_interfaces/share/ament_cmake_export_interfaces/cmake/ament_export_interfaces.cmake:37 (message):
ament_export_interfaces() is deprecated, use ament_export_targets() instead
Call Stack (most recent call first):
CMakeLists.txt:85 (ament_export_interfaces)

In MacOS

  • projectroot.cppcheck

Windows

  • some failures in test_rclcpp

@ahcorde ahcorde merged commit 2e26392 into master Apr 10, 2020
@delete-merged-branch delete-merged-branch bot deleted the ahcorde/rosidl_runtime branch April 10, 2020 10:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants