Skip to content
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

Fix USER_CUSTOM_PACKAGES_DIR #67

Merged
merged 7 commits into from
Jun 16, 2022
Merged

Fix USER_CUSTOM_PACKAGES_DIR #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b11600
added microros_component/extra_packages support
Aetherbase Jun 14, 2022
1d8577b
added microros_component/extra_packages_support
Aetherbase Jun 14, 2022
5b09581
copy only if usr pkgs exist
Aetherbase Jun 14, 2022
aa11b15
changes requested by @pablogs9
Aetherbase Jun 15, 2022
474bc50
Update library_generation.sh
Aetherbase Jun 15, 2022
750a897
Update library_generation.sh
Aetherbase Jun 15, 2022
23ca80d
merge
Aetherbase Jun 16, 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 microros_static_library/library_generation/library_generation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ pushd firmware/mcu_ws > /dev/null
# Import user defined packages
mkdir extra_packages
pushd extra_packages > /dev/null
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../microros_component/extra_packages
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../../microros_component/extra_packages
if [ -d "$USER_CUSTOM_PACKAGES_DIR" ]; then
cp -R $USER_CUSTOM_PACKAGES_DIR/* .
fi
Expand Down
2 changes: 1 addition & 1 deletion microros_static_library_ide/library_generation/library_generation.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ pushd firmware/mcu_ws > /dev/null
# Import user defined packages
mkdir extra_packages
pushd extra_packages > /dev/null
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../microros_component/extra_packages
USER_CUSTOM_PACKAGES_DIR=$BASE_PATH/../../microros_component/extra_packages
if [ -d "$USER_CUSTOM_PACKAGES_DIR" ]; then
cp -R $USER_CUSTOM_PACKAGES_DIR/* .
fi
Expand Down