From 98215d0b3621d15ab02d79ecbce699352b20fa30 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Mon, 3 Apr 2017 11:15:15 +0200
Subject: [PATCH] Set the buffer size in the add_publisher_subscriber help text
to 1 instead of 100. Added dependencies to build the iri_base_driver messages
before the cfg file or the class itself of a new driver. Added the new
dependencies only in the find_package and CATKIN_DEPENDS lines to avoid cmake
warnings.
---
add_publisher_subscriber.sh | 4 ++--
driver_templates/CMakeLists.txt | 2 ++
libraries/create_action_client.sh | 3 ++-
libraries/create_action_server.sh | 3 ++-
libraries/scripts_library.sh | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/add_publisher_subscriber.sh b/add_publisher_subscriber.sh
index 4163f3c..5065c9c 100755
--- a/add_publisher_subscriber.sh
+++ b/add_publisher_subscriber.sh
@@ -51,7 +51,7 @@ do
;;
?)
echo "invalid input argument ${OPTION}"
- kill_exit "Usage: add_publisher_subscriber.sh -o [publisher,subscriber] -p ros_pkg -t topic_name -m message.msg -b 100"
+ kill_exit "Usage: add_publisher_subscriber.sh -o [publisher,subscriber] -p ros_pkg -t topic_name -m message.msg -b 1"
exit
;;
esac
@@ -61,7 +61,7 @@ done
if [ ! "${pub_subs}" ] || [ ! "${ros_pkg}" ] || [ ! "${topic_name}" ] || [ ! "${msg_file}" ] || [ ! "${buffer}" ]
then
echo "Missing input parameters..."
- kill_exit "Usage: add_publisher_subscriber.sh -o [publisher,subscriber] -p ros_pkg -t topic_name -m message.msg -b 100"
+ kill_exit "Usage: add_publisher_subscriber.sh -o [publisher,subscriber] -p ros_pkg -t topic_name -m message.msg -b 1"
fi
#check publisher subscriber parameter
diff --git a/driver_templates/CMakeLists.txt b/driver_templates/CMakeLists.txt
index a5982ed..b86d8fb 100644
--- a/driver_templates/CMakeLists.txt
+++ b/driver_templates/CMakeLists.txt
@@ -94,6 +94,8 @@ target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
# Add message headers dependencies
# ********************************************************************
# add_dependencies(${PROJECT_NAME} <msg_package_name>_generate_messages_cpp)
+add_dependencies(${PROJECT_NAME} iri_base_driver_generate_messages_cpp)
+add_dependencies(${PROJECT_NAME}_gencfg iri_base_driver_generate_messages_cpp)
# ********************************************************************
# Add dynamic reconfigure dependencies
# ********************************************************************
diff --git a/libraries/create_action_client.sh b/libraries/create_action_client.sh
index df3cf2f..9ff86a7 100644
--- a/libraries/create_action_client.sh
+++ b/libraries/create_action_client.sh
@@ -203,7 +203,8 @@ function create_action_client
old_string="iri_base_algorithm"
fi
new_string="${old_string}\ ${actionlib_pkg}"
- sed -i "s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/find_package/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/CATKIN_DEPENDS/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
fi
add_cmake_dependencies "${driver_alg}" "${ros_pkg}" "${act_pkg}"
diff --git a/libraries/create_action_server.sh b/libraries/create_action_server.sh
index 7005269..b4c0ce1 100644
--- a/libraries/create_action_server.sh
+++ b/libraries/create_action_server.sh
@@ -549,7 +549,8 @@ function create_action_server
old_string="iri_base_algorithm"
fi
new_string="${old_string}\ iri_action_server"
- sed -i "s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/find_package/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/CATKIN_DEPENDS/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
fi
################################################################################
diff --git a/libraries/scripts_library.sh b/libraries/scripts_library.sh
index 24cd2c3..d333846 100644
--- a/libraries/scripts_library.sh
+++ b/libraries/scripts_library.sh
@@ -566,7 +566,8 @@ function add_cmake_dependencies
old_string="iri_base_algorithm"
fi
new_string="${old_string}\ ${new_pkg}"
- sed -i "s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/find_package/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
+ sed -i -e "/CATKIN_DEPENDS/ s/${old_string}/${new_string}/g" "CMakeLists.txt"
fi
line="add_dependencies(\${PROJECT_NAME} ${new_pkg}_generate_messages_cpp)"
--
GitLab