From a3dc32303dad6e2fae9bfb631625f5c4141c4876 Mon Sep 17 00:00:00 2001 From: "Alejandro R. Mosteo" Date: Sun, 15 Sep 2024 22:15:40 +0200 Subject: [PATCH] Migration to jazzy complete --- .gitignore | 1 + ada4ros2part.gpr | 19 ++++++++++++------- dev/README.txt | 6 ++++++ dev/devtut.gpr | 4 ++-- dev/setup.bash | 2 +- src/rclada | 2 +- src/rclada_common | 2 +- src/rclada_examples | 2 +- src/rclada_tf2 | 2 +- src/rosidl_generator_ada | 2 +- src/tutorial | 2 +- 11 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 9b87f0e..54d02e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ bin build build_isolated +.clang* cmake-build-* colcon.env gnatinspect* diff --git a/ada4ros2part.gpr b/ada4ros2part.gpr index 1de3e35..20d322a 100644 --- a/ada4ros2part.gpr +++ b/ada4ros2part.gpr @@ -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" ); diff --git a/dev/README.txt b/dev/README.txt index c6d7536..d61852d 100644 --- a/dev/README.txt +++ b/dev/README.txt @@ -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 --event-handlers console_direct+ to see all output immediately (even interleaved) Use colcon --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. diff --git a/dev/devtut.gpr b/dev/devtut.gpr index 60a5724..997c077 100644 --- a/dev/devtut.gpr +++ b/dev/devtut.gpr @@ -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", diff --git a/dev/setup.bash b/dev/setup.bash index d158937..b4bd3b9 100644 --- a/dev/setup.bash +++ b/dev/setup.bash @@ -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 diff --git a/src/rclada b/src/rclada index 750eb2b..2d5d8d8 160000 --- a/src/rclada +++ b/src/rclada @@ -1 +1 @@ -Subproject commit 750eb2b5bc2b7712232cf1a0563d4a0c0a9c31f6 +Subproject commit 2d5d8d8daaa26b0714578a3d804e67bdd88597ae diff --git a/src/rclada_common b/src/rclada_common index f2f366d..3c4b590 160000 --- a/src/rclada_common +++ b/src/rclada_common @@ -1 +1 @@ -Subproject commit f2f366d2e1c2f5aa34ed1fbb1a0ecf85d35587f4 +Subproject commit 3c4b5903ab52e6a6f157f36fc73f046c8e3a8e07 diff --git a/src/rclada_examples b/src/rclada_examples index 618456a..e8f2db3 160000 --- a/src/rclada_examples +++ b/src/rclada_examples @@ -1 +1 @@ -Subproject commit 618456a6a054a0d6cb49a4894a71b82814688e76 +Subproject commit e8f2db3ddedc8c44fee7ecd18ca099aac631f831 diff --git a/src/rclada_tf2 b/src/rclada_tf2 index 8cf4965..d6903ac 160000 --- a/src/rclada_tf2 +++ b/src/rclada_tf2 @@ -1 +1 @@ -Subproject commit 8cf49650d2340d56605e75711d9afed3a00df315 +Subproject commit d6903aca918f4ada533d5472dd9a30e42b45baa2 diff --git a/src/rosidl_generator_ada b/src/rosidl_generator_ada index c46905f..13a10a6 160000 --- a/src/rosidl_generator_ada +++ b/src/rosidl_generator_ada @@ -1 +1 @@ -Subproject commit c46905ff3c809bb3f796c5fd04dd627ab74d5ad5 +Subproject commit 13a10a66c49c0ae91e08a3551e723576aac937e2 diff --git a/src/tutorial b/src/tutorial index e07b5e0..1d8ff5b 160000 --- a/src/tutorial +++ b/src/tutorial @@ -1 +1 @@ -Subproject commit e07b5e06ee23090c50c36e1f6b35f3cb5bb748d5 +Subproject commit 1d8ff5bc54b754e9737214ba72dac9695c6711e7