Skip to content

Commit 03aa3c1

Browse files
mergify[bot]DedSecerCarlosespicurEugenioCollado
authored
fix include path (backport #781) (backport #790) (#800)
* fix include path (#790) * fix include path (#781) * fix include path * Trigger CI Signed-off-by: Carlosespicur <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]> Co-authored-by: Carlosespicur <[email protected]> (cherry picked from commit 22cf5e0) * Remove rsync & execute only in non-host scenario Signed-off-by: Eugenio Collado <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]> Signed-off-by: Eugenio Collado <[email protected]> Co-authored-by: DedSecer <[email protected]> Co-authored-by: Carlosespicur <[email protected]> Co-authored-by: Eugenio Collado <[email protected]> (cherry picked from commit 52d6a34) * Compile service_msgs Signed-off-by: Eugenio Collado <[email protected]> * Compile unique_identifier_msgs Signed-off-by: Eugenio Collado <[email protected]> --------- Signed-off-by: Carlosespicur <[email protected]> Signed-off-by: Eugenio Collado <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: DedSecer <[email protected]> Co-authored-by: Carlosespicur <[email protected]> Co-authored-by: Eugenio Collado <[email protected]>
1 parent cc2b250 commit 03aa3c1

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

config/host/generic/build.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,10 @@ set +o nounset
66
. install/local_setup.bash
77
set -o nounset
88

9+
colcon build --packages-up-to service_msgs unique_identifier_msgs --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@
10+
11+
set +o nounset
12+
. install/local_setup.bash
13+
set -o nounset
14+
915
colcon build --metas src --cmake-args -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=ON $@

scripts/build_firmware.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,17 @@ else
7676
. $PREFIX/config/$RTOS/$PLATFORM/build.sh
7777
fi
7878

79+
######## Fix include paths ########
80+
if [ "$RTOS" != "host" ]; then
81+
cd "$FW_TARGETDIR/mcu_ws"
82+
INCLUDE_ROS2_PACKAGES=$(colcon list | awk '{print $1}' | awk -v d=" " '{s=(NR==1?s:s d)$0}END{print s}')
83+
84+
for var in ${INCLUDE_ROS2_PACKAGES}; do
85+
if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then
86+
mkdir -p "$FW_TARGETDIR/build/include/${var}"
87+
cp -a "$FW_TARGETDIR/build/include/${var}/${var}/". "$FW_TARGETDIR/build/include/${var}/"
88+
rm -rf "$FW_TARGETDIR/build/include/${var}/${var}"
89+
fi
90+
done
91+
fi
92+

0 commit comments

Comments
 (0)