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

Jump to bottom

rename executables with shorter names #177

Merged
merged 1 commit into from Jun 28, 2017
Merged

rename executables with shorter names #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions rclcpp/minimal_client/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,10 +14,10 @@ find_package(ament_cmake REQUIRED)
find_package(example_interfaces REQUIRED)
find_package(rclcpp REQUIRED)

add_executable(${PROJECT_NAME}_main main.cpp)
ament_target_dependencies(${PROJECT_NAME}_main rclcpp example_interfaces)
add_executable(client_main main.cpp)
ament_target_dependencies(client_main rclcpp example_interfaces)

install(TARGETS ${PROJECT_NAME}_main
install(TARGETS client_main
DESTINATION lib/${PROJECT_NAME})

ament_package()
36 changes: 18 additions & 18 deletions rclcpp/minimal_composition/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -17,37 +17,37 @@ find_package(std_msgs REQUIRED)

include_directories(include)

add_library(${PROJECT_NAME}_nodes SHARED
add_library(composition_nodes SHARED
src/publisher_node.cpp
src/subscriber_node.cpp)
target_compile_definitions(${PROJECT_NAME}_nodes
target_compile_definitions(composition_nodes
PRIVATE "MINIMAL_COMPOSITION_DLL")
ament_target_dependencies(${PROJECT_NAME}_nodes rclcpp std_msgs class_loader)
ament_target_dependencies(composition_nodes rclcpp std_msgs class_loader)

add_executable(${PROJECT_NAME}_publisher src/standalone_publisher.cpp)
target_link_libraries(${PROJECT_NAME}_publisher ${PROJECT_NAME}_nodes)
ament_target_dependencies(${PROJECT_NAME}_publisher
rclcpp ${PROJECT_NAME}_nodes)
add_executable(composition_publisher src/standalone_publisher.cpp)
target_link_libraries(composition_publisher composition_nodes)
ament_target_dependencies(composition_publisher
rclcpp composition_nodes)

add_executable(${PROJECT_NAME}_subscriber src/standalone_subscriber.cpp)
target_link_libraries(${PROJECT_NAME}_subscriber ${PROJECT_NAME}_nodes)
ament_target_dependencies(${PROJECT_NAME}_subscriber
rclcpp ${PROJECT_NAME}_nodes)
add_executable(composition_subscriber src/standalone_subscriber.cpp)
target_link_libraries(composition_subscriber composition_nodes)
ament_target_dependencies(composition_subscriber
rclcpp composition_nodes)

add_executable(${PROJECT_NAME}_composed src/composed.cpp)
target_link_libraries(${PROJECT_NAME}_composed ${PROJECT_NAME}_nodes)
ament_target_dependencies(${PROJECT_NAME}_composed rclcpp class_loader)
add_executable(composition_composed src/composed.cpp)
target_link_libraries(composition_composed composition_nodes)
ament_target_dependencies(composition_composed rclcpp class_loader)

install(TARGETS
${PROJECT_NAME}_nodes
composition_nodes
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin)

install(TARGETS
${PROJECT_NAME}_publisher
${PROJECT_NAME}_subscriber
${PROJECT_NAME}_composed
composition_publisher
composition_subscriber
composition_composed
DESTINATION lib/${PROJECT_NAME})

ament_package()
18 changes: 9 additions & 9 deletions rclcpp/minimal_publisher/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,19 +14,19 @@ find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)

add_executable(${PROJECT_NAME}_lambda lambda.cpp)
ament_target_dependencies(${PROJECT_NAME}_lambda rclcpp std_msgs)
add_executable(publisher_lambda lambda.cpp)
ament_target_dependencies(publisher_lambda rclcpp std_msgs)

add_executable(${PROJECT_NAME}_member_function member_function.cpp)
ament_target_dependencies(${PROJECT_NAME}_member_function rclcpp std_msgs)
add_executable(publisher_member_function member_function.cpp)
ament_target_dependencies(publisher_member_function rclcpp std_msgs)

add_executable(${PROJECT_NAME}_not_composable not_composable.cpp)
ament_target_dependencies(${PROJECT_NAME}_not_composable rclcpp std_msgs)
add_executable(publisher_not_composable not_composable.cpp)
ament_target_dependencies(publisher_not_composable rclcpp std_msgs)

install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
${PROJECT_NAME}_not_composable
publisher_lambda
publisher_member_function
publisher_not_composable
DESTINATION lib/${PROJECT_NAME}
)

Expand Down
6 changes: 3 additions & 3 deletions rclcpp/minimal_service/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,10 +14,10 @@ find_package(ament_cmake REQUIRED)
find_package(example_interfaces REQUIRED)
find_package(rclcpp REQUIRED)

add_executable(${PROJECT_NAME}_main main.cpp)
ament_target_dependencies(${PROJECT_NAME}_main rclcpp example_interfaces)
add_executable(service_main main.cpp)
ament_target_dependencies(service_main rclcpp example_interfaces)

install(TARGETS ${PROJECT_NAME}_main
install(TARGETS service_main
DESTINATION lib/${PROJECT_NAME})

ament_package()
18 changes: 9 additions & 9 deletions rclcpp/minimal_subscriber/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -14,19 +14,19 @@ find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)
find_package(std_msgs REQUIRED)

add_executable(${PROJECT_NAME}_lambda lambda.cpp)
ament_target_dependencies(${PROJECT_NAME}_lambda rclcpp std_msgs)
add_executable(subscriber_lambda lambda.cpp)
ament_target_dependencies(subscriber_lambda rclcpp std_msgs)

add_executable(${PROJECT_NAME}_member_function member_function.cpp)
ament_target_dependencies(${PROJECT_NAME}_member_function rclcpp std_msgs)
add_executable(subscriber_member_function member_function.cpp)
ament_target_dependencies(subscriber_member_function rclcpp std_msgs)

add_executable(${PROJECT_NAME}_not_composable not_composable.cpp)
ament_target_dependencies(${PROJECT_NAME}_not_composable rclcpp std_msgs)
add_executable(subscriber_not_composable not_composable.cpp)
ament_target_dependencies(subscriber_not_composable rclcpp std_msgs)

install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
${PROJECT_NAME}_not_composable
subscriber_lambda
subscriber_member_function
subscriber_not_composable
DESTINATION lib/${PROJECT_NAME})

ament_package()
12 changes: 6 additions & 6 deletions rclcpp/minimal_timer/CMakeLists.txt
View file
Open in desktop
Expand Up @@ -13,15 +13,15 @@ endif()
find_package(ament_cmake REQUIRED)
find_package(rclcpp REQUIRED)

add_executable(${PROJECT_NAME}_lambda lambda.cpp)
ament_target_dependencies(${PROJECT_NAME}_lambda rclcpp)
add_executable(timer_lambda lambda.cpp)
ament_target_dependencies(timer_lambda rclcpp)

add_executable(${PROJECT_NAME}_member_function member_function.cpp)
ament_target_dependencies(${PROJECT_NAME}_member_function rclcpp)
add_executable(timer_member_function member_function.cpp)
ament_target_dependencies(timer_member_function rclcpp)

install(TARGETS
${PROJECT_NAME}_lambda
${PROJECT_NAME}_member_function
timer_lambda
timer_member_function
DESTINATION lib/${PROJECT_NAME}
)

Expand Down
6 changes: 3 additions & 3 deletions rclpy/services/minimal_client/setup.py
View file
Open in desktop
Expand Up @@ -29,9 +29,9 @@
test_suite='test',
entry_points={
'console_scripts': [
'examples_rclpy_minimal_client = client:main',
'examples_rclpy_minimal_client_async = client_async:main',
'examples_rclpy_minimal_client_async_member_function ='
'client = client:main',
'client_async = client_async:main',
'client_async_member_function ='
' client_async_member_function:main',
],
},
Expand Down
4 changes: 2 additions & 2 deletions rclpy/services/minimal_service/setup.py
View file
Open in desktop
Expand Up @@ -28,8 +28,8 @@
test_suite='test',
entry_points={
'console_scripts': [
'examples_rclpy_minimal_service = service:main',
'examples_rclpy_minimal_service_member_function = service_member_function:main',
'service = service:main',
'service_member_function = service_member_function:main',
],
},
)
6 changes: 3 additions & 3 deletions rclpy/topics/minimal_publisher/setup.py
View file
Open in desktop
Expand Up @@ -29,9 +29,9 @@
test_suite='test',
entry_points={
'console_scripts': [
'examples_rclpy_minimal_publisher_old_school = publisher_old_school:main',
'examples_rclpy_minimal_publisher_local_function = publisher_local_function:main',
'examples_rclpy_minimal_publisher_member_function = publisher_member_function:main',
'publisher_old_school = publisher_old_school:main',
'publisher_local_function = publisher_local_function:main',
'publisher_member_function = publisher_member_function:main',
],
},
)
6 changes: 3 additions & 3 deletions rclpy/topics/minimal_subscriber/setup.py
View file
Open in desktop
Expand Up @@ -29,9 +29,9 @@
test_suite='test',
entry_points={
'console_scripts': [
'examples_rclpy_minimal_subscriber_old_school = subscriber_old_school:main',
'examples_rclpy_minimal_subscriber_lambda = subscriber_lambda:main',
'examples_rclpy_minimal_subscriber_member_function = subscriber_member_function:main',
'subscriber_old_school = subscriber_old_school:main',
'subscriber_lambda = subscriber_lambda:main',
'subscriber_member_function = subscriber_member_function:main',
],
},
)