From c9ce84704f0b0d365c8c127c584096af709453d1 Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Mon, 30 May 2022 07:51:13 +0200
Subject: [PATCH 1/2] Fix generate lib include folder

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
---
 .github/workflows/ci.yml             |  2 +-
 .github/workflows/nightly.yml        |  2 +-
 config/generate_lib/generic/build.sh | 10 +++++++++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0de952dc..73e41238 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,7 +217,7 @@ jobs:
           apt update
           apt upgrade -y
           apt-get update
-          apt install -y python3-colcon-metadata python3-pip cmake
+          apt install -y python3-colcon-metadata python3-pip cmake rsync
           rosdep update --rosdistro ${{ env.ROS_DISTRO }}
           rosdep install --rosdistro ${{ env.ROS_DISTRO }} -y --from-paths src --ignore-src -y
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index aa4780cb..0311fbd4 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -690,7 +690,7 @@ jobs:
           apt update
           apt upgrade -y
           # Install last version of CMake
-          apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget
+          apt install -y apt-transport-https ca-certificates gnupg software-properties-common wget rsync
           if [ $(lsb_release -sr) = "22.04" ]; then
             echo "Using Ubuntu mainline CMake"
           else
diff --git a/config/generate_lib/generic/build.sh b/config/generate_lib/generic/build.sh
index 7db6e00c..c1344407 100755
--- a/config/generate_lib/generic/build.sh
+++ b/config/generate_lib/generic/build.sh
@@ -22,7 +22,7 @@ BUILD_DIR=$FW_TARGETDIR/build
 pushd $FW_TARGETDIR/mcu_ws >/dev/null
 
 	rm -rf build install log
-	
+
    	colcon build \
 		--merge-install \
 		--packages-ignore-regex=.*_cpp \
@@ -50,4 +50,12 @@ pushd $FW_TARGETDIR/mcu_ws >/dev/null
     cp -R $FW_TARGETDIR/mcu_ws/install/include $BUILD_DIR/; \
 	cd ..; rm -rf libmicroros;
 
+	######## Fix include paths  ########
+	INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')
+
+	for var in ${INCLUDE_ROS2_PACKAGES}; do
+		rsync -r $BUILD_DIR/include/${var}/${var}/* $BUILD_DIR/include/${var}/
+		rm -rf $BUILD_DIR/include/${var}/${var}/
+	done
+
 popd >/dev/null

From eb5354e0e7f95dc993fdbd0bb0f75cd725a4f37f Mon Sep 17 00:00:00 2001
From: Pablo Garrido <pablogs9@gmail.com>
Date: Mon, 30 May 2022 12:41:12 +0200
Subject: [PATCH 2/2] Update

Signed-off-by: Pablo Garrido <pablogs9@gmail.com>
---
 config/generate_lib/generic/build.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/config/generate_lib/generic/build.sh b/config/generate_lib/generic/build.sh
index c1344407..e2e2697a 100755
--- a/config/generate_lib/generic/build.sh
+++ b/config/generate_lib/generic/build.sh
@@ -51,11 +51,14 @@ pushd $FW_TARGETDIR/mcu_ws >/dev/null
 	cd ..; rm -rf libmicroros;
 
 	######## Fix include paths  ########
-	INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')
+	INCLUDE_ROS2_PACKAGES=$(cd $FW_TARGETDIR/mcu_ws && colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')
 
 	for var in ${INCLUDE_ROS2_PACKAGES}; do
-		rsync -r $BUILD_DIR/include/${var}/${var}/* $BUILD_DIR/include/${var}/
-		rm -rf $BUILD_DIR/include/${var}/${var}/
+		if [ -d "$BUILD_DIR/include/${var}/${var}" ]
+		then
+			rsync -r $BUILD_DIR/include/${var}/${var}/* $BUILD_DIR/include/${var}/ || true
+			rm -rf $BUILD_DIR/include/${var}/${var}/
+		fi
 	done
 
 popd >/dev/null