Migration to jazzy complete

ada-ros · Sep 17, 2024 · a3dc323 · a3dc323
1 parent 79f3482
commit a3dc323
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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.
diff --git 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
@@ -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
diff --git a/src/rclada_common b/src/rclada_common
diff --git a/src/rclada_examples b/src/rclada_examples
diff --git a/src/rclada_tf2 b/src/rclada_tf2
diff --git a/src/rosidl_generator_ada b/src/rosidl_generator_ada
diff --git a/src/tutorial b/src/tutorial