Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Break rosidl_defaults into rosidl_core and rosidl_defaults #23

Closed
wants to merge 4 commits into from
Closed

Break rosidl_defaults into rosidl_core and rosidl_defaults #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a103ff
Create rosidl_core_generators
jacobperron Aug 2, 2022
76c6af1
move core_generators to new repo
ihasdapie Aug 9, 2022
bdb06a8
export service and action_msgs
ihasdapie Aug 9, 2022
ae9fada
break rosidl_default_runtime into rosidl_core_runtime and rosidl_defa…
ihasdapie Aug 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions rosidl_default_generators/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ project(rosidl_default_generators NONE)
find_package(ament_cmake REQUIRED)

ament_export_dependencies(ament_cmake_core)
ament_export_dependencies(rosidl_cmake)
ament_export_dependencies(rosidl_core_generators)
ament_export_dependencies(service_msgs)
ament_export_dependencies(action_msgs)

if(BUILD_TESTING)
find_package(ament_lint_auto REQUIRED)
ament_lint_auto_find_test_dependencies()
endif()

ament_package(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See #22 (comment)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also see #22 (comment)

CONFIG_EXTRAS "rosidl_default_generators-extras.cmake.in"
)
ament_package()
26 changes: 7 additions & 19 deletions rosidl_default_generators/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,20 @@
<author email="dthomas@osrfoundation.org">Dirk Thomas</author>

<buildtool_depend>ament_cmake</buildtool_depend>

<!-- Code generation for Actions depends on action_msgs -->
<buildtool_export_depend>action_msgs</buildtool_export_depend>

<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>
<buildtool_export_depend>rosidl_cmake</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_generator_packages -->
<buildtool_export_depend>rosidl_generator_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_generator_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_generator_py</buildtool_export_depend>
<!-- Code generation for Services depends on service_msgs -->
<buildtool_export_depend>service_msgs</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_c_packages -->
<buildtool_export_depend>rosidl_typesupport_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_fastrtps_c</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_introspection_c</buildtool_export_depend>
<buildtool_export_depend>ament_cmake_core</buildtool_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_cpp_packages -->
<buildtool_export_depend>rosidl_typesupport_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_fastrtps_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_typesupport_introspection_cpp</buildtool_export_depend>
<buildtool_export_depend>rosidl_core_generators</buildtool_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<group_depend>rosidl_generator_packages</group_depend>
<group_depend>rosidl_typesupport_c_packages</group_depend>
<group_depend>rosidl_typesupport_cpp_packages</group_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
33 changes: 0 additions & 33 deletions rosidl_default_generators/rosidl_default_generators-extras.cmake.in
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions rosidl_default_runtime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,4 @@ if(BUILD_TESTING)
ament_lint_auto_find_test_dependencies()
endif()

ament_package(
CONFIG_EXTRAS "rosidl_default_runtime-extras.cmake.in"
)
Comment on lines -12 to -14
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same

ament_package()
21 changes: 3 additions & 18 deletions rosidl_default_runtime/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,28 +10,13 @@

<buildtool_depend>ament_cmake</buildtool_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_runtime_packages -->
<build_export_depend>rosidl_runtime_c</build_export_depend>
<build_export_depend>rosidl_runtime_cpp</build_export_depend>
<build_export_depend>rosidl_generator_py</build_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_c_packages -->
<build_export_depend>rosidl_typesupport_c</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_c</build_export_depend>

<!-- Bloom does not support group_depend, so this unrolls rosidl_typesupport_cpp_packages -->
<build_export_depend>rosidl_typesupport_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_fastrtps_cpp</build_export_depend>
<build_export_depend>rosidl_typesupport_introspection_cpp</build_export_depend>
<build_export_depend>rosidl_core_generators</build_export_depend>
<build_export_depend>action_msgs</build_export_depend>
<build_export_depend>service_msgs</build_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>

<group_depend>rosidl_runtime_packages</group_depend>
<group_depend>rosidl_typesupport_c_packages</group_depend>
<group_depend>rosidl_typesupport_cpp_packages</group_depend>

<export>
<build_type>ament_cmake</build_type>
</export>
Expand Down
24 changes: 0 additions & 24 deletions rosidl_default_runtime/rosidl_default_runtime-extras.cmake.in
View file
Open in desktop

This file was deleted.