Skip to content

Fix generate lib include folder #531

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

Open
pablogs9 wants to merge 2 commits into
base: humble
Choose a base branch
from
Open

Fix generate lib include folder #531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ce847
Fix generate lib include folder
pablogs9 May 30, 2022
eb5354e
Update
pablogs9 May 30, 2022
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
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 9 additions & 1 deletion config/generate_lib/generic/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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