From 12d508b42627f5075f8139075b4a404b0076f5e6 Mon Sep 17 00:00:00 2001 From: Harsh Davda Date: Thu, 16 Jun 2022 15:05:24 +0530 Subject: [PATCH] Fix USER_CUSTOM_PACKAGES_DIR (#67) * added microros_component/extra_packages support * added microros_component/extra_packages_support * copy only if usr pkgs exist * changes requested by @pablogs9 * Update library_generation.sh * Update library_generation.sh (cherry picked from commit 80b34177e20b1b0ed3bf9bc210b5eac7f1a53513) --- .../library_generation/library_generation.sh | 2 +- .../library_generation/library_generation.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microros_static_library/library_generation/library_generation.sh b/microros_static_library/library_generation/library_generation.sh index a1668c8..13f4ad4 100755 --- a/microros_static_library/library_generation/library_generation.sh +++ b/microros_static_library/library_generation/library_generation.sh @@ -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 diff --git a/microros_static_library_ide/library_generation/library_generation.sh b/microros_static_library_ide/library_generation/library_generation.sh index c556a38..f7ade0b 100755 --- a/microros_static_library_ide/library_generation/library_generation.sh +++ b/microros_static_library_ide/library_generation/library_generation.sh @@ -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