From 52fdee535e7713fe58f917bdd26b31457dd3a1e7 Mon Sep 17 00:00:00 2001
From: Niklas Halle <niklas@niklashalle.net>
Date: Mon, 19 May 2025 13:20:25 +0200
Subject: [PATCH] also add the cyclonedds package

---
 .gitmodules           | 3 +++
 .vscode/settings.json | 3 ++-
 Dockerfile            | 2 +-
 build.sh              | 4 ++++
 src/cyclonedds        | 1 +
 src/ros2_tracing      | 2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 160000 src/cyclonedds

diff --git a/.gitmodules b/.gitmodules
index 5c5e335..66cfb0c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,3 +21,6 @@
 	path = src/rmw_cyclonedds
 	url = git@git.niklashalle.net:niklas/rmw_cyclonedds.git
 	branch = foxy
+[submodule "src/cyclonedds"]
+	path = src/cyclonedds
+	url = git@git.niklashalle.net:niklas/cyclonedds.git
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 8b61b90..90df76a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -72,7 +72,8 @@
         "variant": "cpp",
         "codecvt": "cpp",
         "forward_list": "cpp",
-        "valarray": "cpp"
+        "valarray": "cpp",
+        "ddsi_sertopic.h": "c"
     },
     "cmake.ignoreCMakeListsMissing": true,
     "python.autoComplete.extraPaths": [
diff --git a/Dockerfile b/Dockerfile
index 45c0958..98e1058 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,7 +75,7 @@ RUN add-apt-repository ppa:lttng/stable-2.13 && \
     apt-get update -q && \
     apt-get install -y lttng-tools lttng-modules-dkms liblttng-ust-dev && \
     apt-get install -y python3-babeltrace python3-lttng python3-pytest \
-     python3-pytest-cov python3-pandas ros-foxy-rmw-cyclonedds-cpp && \
+     python3-pytest-cov python3-pandas bison && \
     rm -rf /var/lib/apt/lists/*
 
 # Python bokeh is not available in the default apt repository
diff --git a/build.sh b/build.sh
index 6b64257..cd45cf5 100755
--- a/build.sh
+++ b/build.sh
@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 
+set -eo pipefail
+
 colcon build --packages-select tracetools
 source install/setup.bash
+colcon build --packages-select cyclonedds
+source install/setup.bash
 colcon build --packages-select rmw_cyclonedds_cpp
 source install/setup.bash
 colcon build --packages-select rcl rcl_yaml_param_parser
diff --git a/src/cyclonedds b/src/cyclonedds
new file mode 160000
index 0000000..412d818
--- /dev/null
+++ b/src/cyclonedds
@@ -0,0 +1 @@
+Subproject commit 412d818269b6e8e5b7eae32f7e245935bd30f4a7
diff --git a/src/ros2_tracing b/src/ros2_tracing
index c0a5cf2..e8637c9 160000
--- a/src/ros2_tracing
+++ b/src/ros2_tracing
@@ -1 +1 @@
-Subproject commit c0a5cf2d1dc8706a62bae59123e2c71a6707ac33
+Subproject commit e8637c9043b9bc396135dbfa7068143bfa8a879c