Skip to content

Install spawner/unspawner using console_script entrypoint #607

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

Merged
bmagyar merged 1 commit into from
Feb 16, 2022
Merged

Install spawner/unspawner using console_script entrypoint #607

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions controller_manager/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
endif()

find_package(ament_cmake REQUIRED)
find_package(ament_cmake_python REQUIRED)
find_package(ament_cmake_core REQUIRED)
find_package(ament_index_cpp REQUIRED)
find_package(controller_interface REQUIRED)
Expand Down Expand Up @@ -53,14 +54,6 @@ install(DIRECTORY include/
DESTINATION include
)

install(PROGRAMS
scripts/spawner
scripts/spawner.py # Deprecated
scripts/unspawner
scripts/unspawner.py # Deprecated
DESTINATION lib/${PROJECT_NAME}
)

if(BUILD_TESTING)
find_package(ament_cmake_gmock REQUIRED)
find_package(ament_cmake_gtest REQUIRED)
Expand Down Expand Up @@ -160,7 +153,7 @@ if(BUILD_TESTING)
endif()

# Install Python modules
ament_python_install_package(${PROJECT_NAME})
ament_python_install_package(${PROJECT_NAME} SCRIPTS_DESTINATION lib/${PROJECT_NAME})

ament_export_libraries(
controller_manager
Expand Down
0 controller_manager/scripts/spawner.py → ...ler_manager/controller_manager/spawner.py
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 controller_manager/scripts/unspawner.py → ...r_manager/controller_manager/unspawner.py
100755 → 100644
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions controller_manager/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<license>Apache License 2.0</license>

<buildtool_depend>ament_cmake</buildtool_depend>
<buildtool_depend>ament_cmake_python</buildtool_depend>

<depend>ament_index_cpp</depend>
<depend>controller_interface</depend>
Expand Down
21 changes: 0 additions & 21 deletions controller_manager/scripts/spawner
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions controller_manager/scripts/unspawner
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions controller_manager/setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[options.entry_points]
console_scripts =
spawner = controller_manager.spawner:main
unspawner = controller_manager.unspawner:main