Skip to content

Commit

Permalink
Add mechanism to disable workaround for dependency groups
Browse files Browse the repository at this point in the history 
Signed-off-by: Scott K Logan <logans@cottsay.net>
  • Loading branch information
@cottsay
cottsay committed Apr 24, 2024
1 parent 84fa73d commit 84e2196
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 28 deletions.
24 changes: 10 additions & 14 deletions rosidl_core_generators/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,16 @@
<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>

<!-- 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>

<!-- 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>
<!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_cpp</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_py</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_c</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_cpp</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_cpp</buildtool_export_depend>
<buildtool_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_cpp</buildtool_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down
24 changes: 10 additions & 14 deletions rosidl_core_runtime/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,16 @@

<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>
<!-- Explicit group resolution - see ros-infrastructure/catkin_pkg#369 -->
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_runtime_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_runtime_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_generator_py</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_c</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_fastrtps_cpp</build_export_depend>
<build_export_depend condition="$DISABLE_GROUPS_WORKAROUND != 1">rosidl_typesupport_introspection_cpp</build_export_depend>

<test_depend>ament_lint_auto</test_depend>
<test_depend>ament_lint_common</test_depend>
Expand Down

0 comments on commit 84e2196

Please sign in to comment.