Skip to content

fix #793 #794

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dbenders1 wants to merge 1 commit into from
Closed

fix #793 #794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions scripts/build_firmware.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,15 @@ else
. $PREFIX/config/$RTOS/$PLATFORM/build.sh
fi

######## Fix include paths ########
cd $FW_TARGETDIR/mcu_ws
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
if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then
rsync -r $FW_TARGETDIR/build/include/${var}/${var}/* $FW_TARGETDIR/build/include/${var}
rm -rf $FW_TARGETDIR/build/include/${var}/${var}
fi
done
######## Fix include paths in mcu_ws ########
if [ -d "$FW_TARGETDIR/mcu_ws" ]; then
cd $FW_TARGETDIR/mcu_ws
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
if [ -d "$FW_TARGETDIR/build/include/${var}/${var}" ]; then
rsync -r $FW_TARGETDIR/build/include/${var}/${var}/* $FW_TARGETDIR/build/include/${var}
rm -rf $FW_TARGETDIR/build/include/${var}/${var}
fi
done
fi
Loading