niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename {c_}utilities to rcutils (#130)

Browse source
This commit is contained in:
William Woodall 2017-04-20 11:15:03 -07:00 • committed by GitHub
parent f9e03e51bb
commit bed40d3d40
10 changed files with 55 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

15
rcl_lifecycle/CMakeLists.txt
View file

@ -3,10 +3,11 @@ cmake_minimum_required(VERSION 3.5)
project(rcl_lifecycle)
find_package(ament_cmake REQUIRED)
find_package(c_utilities REQUIRED)
find_package(rcl REQUIRED)
find_package(rmw REQUIRED)
find_package(lifecycle_msgs REQUIRED)
find_package(rcl REQUIRED)
find_package(rcutils REQUIRED)
find_package(rmw REQUIRED)
include_directories(include)
@ -14,7 +15,8 @@ set(rcl_lifecycle_sources
src/com_interface.c
src/default_state_machine.c
src/rcl_lifecycle.c
src/transition_map.c)
src/transition_map.c
)
set_source_files_properties(
${rcl_lifecycle_sources}
PROPERTIES language "C")
@ -26,9 +28,10 @@ add_library(
${rcl_lifecycle_sources})
ament_target_dependencies(rcl_lifecycle
"c_utilities"
"lifecycle_msgs"
"rcl")
"rcl"
"rcutils"
)
# Causes the visibility macros to use dllexport rather than dllimport,
# which is appropriate when building the dll but not consuming it.

4
rcl_lifecycle/package.xml
View file

@ -10,15 +10,15 @@
<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>rosidl_default_generators</buildtool_depend>
<build_depend>c_utilities</build_depend>
<build_depend>lifecycle_msgs</build_depend>
<build_depend>rcl</build_depend>
<build_depend>rcutils</build_depend>
<build_depend>rmw_implementation</build_depend>
<build_depend>rosidl_default_generators</build_depend>
<exec_depend>c_utilities</exec_depend>
<exec_depend>lifecycle_msgs</exec_depend>
<exec_depend>rcl</exec_depend>
<exec_depend>rcutils</exec_depend>
<exec_depend>rmw_implementation</exec_depend>
<exec_depend>rosidl_default_runtime</exec_depend>

12
rcl_lifecycle/src/com_interface.c
View file

@ -22,7 +22,7 @@ extern "C"
#include <stdio.h>
#include <string.h>
#include "c_utilities/concat.h"
#include "rcutils/concat.h"
#include "lifecycle_msgs/msg/transition_event.h"
@ -119,7 +119,7 @@ rcl_lifecycle_com_interface_init(
// initialize publisher
{
topic_name = utilities_concat(node_name, pub_transition_event_suffix, "__");
topic_name = rcutils_concat(node_name, pub_transition_event_suffix, "__");
ret = rcl_lifecycle_validate_topic_name(topic_name);
if (ret != RMW_RET_OK) {
goto fail;
@ -142,7 +142,7 @@ rcl_lifecycle_com_interface_init(
// initialize change state service
{
topic_name = utilities_concat(node_name, srv_change_state_suffix, "__");
topic_name = rcutils_concat(node_name, srv_change_state_suffix, "__");
ret = rcl_lifecycle_validate_topic_name(topic_name);
if (ret != RMW_RET_OK) {
goto fail;
@ -162,7 +162,7 @@ rcl_lifecycle_com_interface_init(
// initialize get state service
{
topic_name = utilities_concat(node_name, srv_get_state_suffix, "__");
topic_name = rcutils_concat(node_name, srv_get_state_suffix, "__");
ret = rcl_lifecycle_validate_topic_name(topic_name);
if (ret != RMW_RET_OK) {
goto fail;
@ -182,7 +182,7 @@ rcl_lifecycle_com_interface_init(
// initialize get available states service
{
topic_name = utilities_concat(node_name, srv_get_available_states_suffix, "__");
topic_name = rcutils_concat(node_name, srv_get_available_states_suffix, "__");
ret = rcl_lifecycle_validate_topic_name(topic_name);
if (ret != RMW_RET_OK) {
goto fail;
@ -202,7 +202,7 @@ rcl_lifecycle_com_interface_init(
// initialize get available transitions service
{
topic_name = utilities_concat(node_name, srv_get_available_transitions_suffix, "__");
topic_name = rcutils_concat(node_name, srv_get_available_transitions_suffix, "__");
ret = rcl_lifecycle_validate_topic_name(topic_name);
if (ret != RMW_RET_OK) {
goto fail;