Skip to content

Commit

Permalink
Migration to jazzy complete
Browse files Browse the repository at this point in the history
  • Loading branch information
mosteo committed Sep 17, 2024
1 parent 79f3482 commit a3dc323
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
bin
build
build_isolated
.clang*
cmake-build-*
colcon.env
gnatinspect*
Expand Down
19 changes: 12 additions & 7 deletions ada4ros2part.gpr
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,35 @@ aggregate project Ada4ROS2Part is
-- Our editable projects FIRST
"src/rclada_common/gpr_aaa",
"src/rclada_common/gpr_ament",
"src/rclada_common/gpr_c_builtins",
"src/rclada_common/gpr_c_umwi",
"src/rosidl_generator_ada/gpr_c_typesupport",
"src/rosidl_generator_ada/gpr_generator",
"src/rosidl_generator_ada/gpr_rosidl",
"src/rosidl_generator_ada/gpr_rosidl/dl-ada",
"src/rosidl_generator_ada/gpr_rosidl/dl-ada/cstrings",
"src/rclada/gpr_rcl",
"src/rclada_examples",

-- Auto imports generated during colcon build LAST
"install/rclada_common/share/gpr",
"install/rosidl_generator_ada/share/gpr",
"install/rclada/share/gpr"
"install/rclada/share/gpr",
"install/rclada_examples/share/gpr"
);

-- Root project files and Editable Subprojects

for Project_Files use (
"src/rclada_common/gpr_aaa/aaa.gpr",
"src/rclada_common/gpr_ament/ament.gpr",
-- "src/rclada_common/gpr_aaa/aaa.gpr",
-- "src/rclada_common/gpr_ament/ament.gpr",

"src/rosidl_generator_ada/gpr_generator/generator.gpr",
"src/rosidl_generator_ada/gpr_rosidl/rosidl.gpr",
-- "src/rosidl_generator_ada/gpr_rosidl/rosidl.gpr"

"src/rclada/gpr_rcl/rcl.gpr",
"src/rclada/gpr_selftest/rcl_selftest.gpr"
-- "src/rclada_examples/examples.gpr",
"src/rclada/gpr_selftest/rcl_selftest.gpr",

"src/rclada_examples/examples.gpr"
-- "src/rclada_client_skeleton/ada_project.gpr",
-- "src/rclada_fosdem20/fosdem20.gpr"
);
Expand Down
6 changes: 6 additions & 0 deletions dev/README.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
Use make.sh to build from pure scratch all packages up to $1
use make-package.sh to build semi-scratch (no regens) package $1, presumes deps OK
Use update[-package].sh to update all or one packages up to $1

Use colcon <verb> --event-handlers console_direct+ to see all output immediately (even interleaved)
Use colcon <verb> --event-handlers console_cohesion+ to see every package output post hoc

Use colcon graph to see dependencies

Use ../ada4ros2.gpr after a successful build to edit all Ada ros2 packages simultaneously in GPS
Use ../ada4ros2part.gpr with only the projects already generated for incremental fixing.
4 changes: 2 additions & 2 deletions dev/devtut.gpr
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ Aggregate project Devtut is
"../src/rosidl_generator_ada/gpr_generator/generator.gpr",
"../src/rosidl_generator_ada/gpr_rosidl/rosidl.gpr",
"../src/rclada/gpr_rcl/rcl.gpr",
"../src/rclada/gpr_selftest/rcl_selftest.gpr",
"../src/rclada_examples/examples.gpr",
-- "../src/rclada/gpr_selftest/rcl_selftest.gpr",
-- "../src/rclada_examples/examples.gpr",
"../src/rclada_tf2/gpr_tf2_ros/tf2_ros.gpr",
"../src/tutorial/common/tutorial_common.gpr",
"../src/tutorial/exercises/tutorial_exercises.gpr",
Expand Down
2 changes: 1 addition & 1 deletion dev/setup.bash
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if [ -f install/setup.bash ]; then
source install/setup.bash
else
source /opt/ros/foxy/setup.bash
source /opt/ros/jazzy/setup.bash
fi
2 changes: 1 addition & 1 deletion src/rclada
Submodule rclada updated 137 files
2 changes: 1 addition & 1 deletion src/rclada_examples
2 changes: 1 addition & 1 deletion src/rosidl_generator_ada
Submodule rosidl_generator_ada updated 90 files
+30 −9 CMakeLists.txt
+7 −2 gpr_c_typesupport/gen/builtin_interfaces_builtin_interfaces_msg_duration_h.ads
+7 −2 gpr_c_typesupport/gen/builtin_interfaces_builtin_interfaces_msg_rosidl_generator_c_uvisibility_control_h.ads
+7 −2 ...pport/gen/builtin_interfaces_builtin_interfaces_msg_rosidl_typesupport_fastrtps_c_uvisibility_control_h.ads
+7 −2 ...ort/gen/builtin_interfaces_builtin_interfaces_msg_rosidl_typesupport_fastrtps_cpp_uvisibility_control_h.ads
+7 −2 .../gen/builtin_interfaces_builtin_interfaces_msg_rosidl_typesupport_introspection_c_uvisibility_control_h.ads
+7 −2 gpr_c_typesupport/gen/builtin_interfaces_builtin_interfaces_msg_time_h.ads
+0 −128 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_duration_ufunctions_h.ads
+0 −30 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_duration_urosidl_typesupport_fastrtps_c_h.ads
+0 −17 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_duration_urosidl_typesupport_introspection_c_h.ads
+0 −32 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_duration_ustruct_h.ads
+0 −18 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_duration_utype_support_h.ads
+0 −128 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_time_ufunctions_h.ads
+0 −30 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_time_urosidl_typesupport_fastrtps_c_h.ads
+0 −17 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_time_urosidl_typesupport_introspection_c_h.ads
+0 −32 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_time_ustruct_h.ads
+0 −18 gpr_c_typesupport/gen/builtin_interfaces_msg_detail_time_utype_support_h.ads
+0 −17 gpr_c_typesupport/gen/builtin_interfaces_msg_duration_urosidl_typesupport_connext_c_h.ads
+0 −15 gpr_c_typesupport/gen/builtin_interfaces_msg_rosidl_typesupport_connext_c_uvisibility_control_h.ads
+0 −15 gpr_c_typesupport/gen/builtin_interfaces_msg_rosidl_typesupport_connext_cpp_uvisibility_control_h.ads
+0 −17 gpr_c_typesupport/gen/builtin_interfaces_msg_time_urosidl_typesupport_connext_c_h.ads
+153 −0 gpr_c_typesupport/gen/rcutils_rcutils_allocator_h.ads
+439 −0 gpr_c_typesupport/gen/rcutils_rcutils_types_hash_map_h.ads
+69 −0 gpr_c_typesupport/gen/rcutils_rcutils_types_rcutils_ret_h.ads
+0 −42 gpr_c_typesupport/gen/rosidl_runtime_c_action_type_support_struct_h.ads
+0 −75 gpr_c_typesupport/gen/rosidl_runtime_c_message_type_support_struct_h.ads
+0 −267 gpr_c_typesupport/gen/rosidl_runtime_c_primitives_sequence_functions_h.ads
+0 −138 gpr_c_typesupport/gen/rosidl_runtime_c_primitives_sequence_h.ads
+65 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_action_type_support_struct_h.ads
+8 −3 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_message_initialization_h.ads
+104 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_message_type_support_struct_h.ads
+494 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_primitives_sequence_functions_h.ads
+143 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_primitives_sequence_h.ads
+14 −9 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_sequence_bound_h.ads
+157 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_service_type_support_struct_h.ads
+9 −4 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_string_bound_h.ads
+79 −12 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_string_functions_h.ads
+15 −10 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_string_h.ads
+220 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_field_type_ufunctions_h.ads
+219 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_field_type_ustruct_h.ads
+220 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_field_ufunctions_h.ads
+51 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_field_ustruct_h.ads
+220 −0 ...support/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_individual_type_description_ufunctions_h.ads
+54 −0 ...ypesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_individual_type_description_ustruct_h.ads
+220 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_key_value_ufunctions_h.ads
+44 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_key_value_ustruct_h.ads
+219 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_type_description_ufunctions_h.ads
+46 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_type_description_ustruct_h.ads
+219 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_type_source_ufunctions_h.ads
+55 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_type_source_ustruct_h.ads
+670 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_description_utils_h.ads
+87 −0 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_type_hash_h.ads
+83 −16 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_u16string_functions_h.ads
+16 −11 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_u16string_h.ads
+7 −2 gpr_c_typesupport/gen/rosidl_runtime_c_rosidl_runtime_c_visibility_control_h.ads
+0 −75 gpr_c_typesupport/gen/rosidl_runtime_c_service_type_support_struct_h.ads
+0 −19 gpr_c_typesupport/gen/rosidl_typesupport_introspection_c_field_types_h.ads
+0 −53 gpr_c_typesupport/gen/rosidl_typesupport_introspection_c_message_introspection_h.ads
+72 −0 gpr_c_typesupport/gen/rosidl_typesupport_introspection_c_rosidl_typesupport_introspection_c_field_types_h.ads
+9 −3 gpr_c_typesupport/gen/rosidl_typesupport_introspection_c_rosidl_typesupport_introspection_c_identifier_h.ads
+117 −0 ...pport/gen/rosidl_typesupport_introspection_c_rosidl_typesupport_introspection_c_message_introspection_h.ads
+44 −0 ...pport/gen/rosidl_typesupport_introspection_c_rosidl_typesupport_introspection_c_service_introspection_h.ads
+7 −2 ...esupport/gen/rosidl_typesupport_introspection_c_rosidl_typesupport_introspection_c_visibility_control_h.ads
+0 −28 gpr_c_typesupport/gen/rosidl_typesupport_introspection_c_service_introspection_h.ads
+0 −128 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_dimension_ufunctions_h.ads
+0 −30 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_dimension_urosidl_typesupport_fastrtps_c_h.ads
+0 −17 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_dimension_urosidl_typesupport_introspection_c_h.ads
+0 −35 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_dimension_ustruct_h.ads
+0 −18 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_dimension_utype_support_h.ads
+0 −128 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_layout_ufunctions_h.ads
+0 −30 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_layout_urosidl_typesupport_fastrtps_c_h.ads
+0 −17 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_layout_urosidl_typesupport_introspection_c_h.ads
+0 −34 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_layout_ustruct_h.ads
+0 −18 gpr_c_typesupport/gen/std_msgs_msg_detail_multi_array_layout_utype_support_h.ads
+51 −0 gpr_c_typesupport/gen/std_msgs_std_msgs_msg_detail_multi_array_dimension_ustruct_h.ads
+72 −0 gpr_c_typesupport/gen/std_msgs_std_msgs_msg_detail_multi_array_layout_ustruct_h.ads
+82 −95 gpr_c_typesupport/gen/stdint_h.ads
+5 −0 gpr_generator/generator.gpr
+7 −2 gpr_generator/src/rosidl-generator.adb
+1 −1 gpr_rosidl/dl-ada
+3 −13 gpr_rosidl/rosidl.gpr
+9 −4 gpr_rosidl/src/rosidl-dynamic.adb
+10 −6 gpr_rosidl/src/rosidl-dynamic.ads
+2 −2 gpr_rosidl/src/rosidl-impl-arrays.ads
+5 −5 gpr_rosidl/src/rosidl-introspection.ads
+2 −2 gpr_rosidl/src/rosidl-static-message.ads
+3 −4 gpr_rosidl/src/rosidl-symbols.ads
+2 −1 gpr_rosidl/src/rosidl-types.adb
+3 −2 gpr_rosidl/src/rosidl-types.ads
+4 −4 gpr_rosidl/src/rosidl-typesupport.ads

0 comments on commit a3dc323

Please sign in to comment.