From b260e83dfe108268a692e877acb20e2a919b3c25 Mon Sep 17 00:00:00 2001 From: teapfw <37943506+teapfw@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:33:49 -0400 Subject: [PATCH] Implements a hotfix for building on ROS2 Humble described in ament/ament_cmake#514: https://github.com/ament/ament_cmake/issues/514\#issuecomment-2143488871 --- sound_play/CMakeLists.txt | 2 +- sound_play/scripts/play.py | 2 +- sound_play/scripts/playbuiltin.py | 2 +- sound_play/scripts/playpackage.py | 2 +- sound_play/scripts/say.py | 2 +- sound_play/scripts/shutup.py | 2 +- sound_play/scripts/soundclient_example.py | 2 +- sound_play/scripts/test.py | 2 +- sound_play/{sound_play => sound_play_py}/__init__.py | 0 sound_play/{sound_play => sound_play_py}/libsoundplay.py | 0 10 files changed, 8 insertions(+), 8 deletions(-) rename sound_play/{sound_play => sound_play_py}/__init__.py (100%) rename sound_play/{sound_play => sound_play_py}/libsoundplay.py (100%) diff --git a/sound_play/CMakeLists.txt b/sound_play/CMakeLists.txt index 23be34e7..a8c48f35 100644 --- a/sound_play/CMakeLists.txt +++ b/sound_play/CMakeLists.txt @@ -33,7 +33,7 @@ rosidl_generate_interfaces(${PROJECT_NAME} builtin_interfaces ) -ament_python_install_package(${PROJECT_NAME}) +ament_python_install_package(${PROJECT_NAME}_py) install(PROGRAMS scripts/is_speaking.py diff --git a/sound_play/scripts/play.py b/sound_play/scripts/play.py index 58e8b815..669a6926 100755 --- a/sound_play/scripts/play.py +++ b/sound_play/scripts/play.py @@ -40,7 +40,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient if __name__ == '__main__': diff --git a/sound_play/scripts/playbuiltin.py b/sound_play/scripts/playbuiltin.py index 10f4a0b7..d4c00cdb 100755 --- a/sound_play/scripts/playbuiltin.py +++ b/sound_play/scripts/playbuiltin.py @@ -40,7 +40,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient if __name__ == '__main__': diff --git a/sound_play/scripts/playpackage.py b/sound_play/scripts/playpackage.py index faebc8cf..e46f78ec 100755 --- a/sound_play/scripts/playpackage.py +++ b/sound_play/scripts/playpackage.py @@ -40,7 +40,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient if __name__ == '__main__': diff --git a/sound_play/scripts/say.py b/sound_play/scripts/say.py index be90633a..629565c8 100755 --- a/sound_play/scripts/say.py +++ b/sound_play/scripts/say.py @@ -41,7 +41,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient if __name__ == '__main__': diff --git a/sound_play/scripts/shutup.py b/sound_play/scripts/shutup.py index b159c92c..5ff5df56 100755 --- a/sound_play/scripts/shutup.py +++ b/sound_play/scripts/shutup.py @@ -40,7 +40,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient if __name__ == '__main__': diff --git a/sound_play/scripts/soundclient_example.py b/sound_play/scripts/soundclient_example.py index 8f5a09bc..81b81bc3 100755 --- a/sound_play/scripts/soundclient_example.py +++ b/sound_play/scripts/soundclient_example.py @@ -10,7 +10,7 @@ import rclpy import rclpy.utilities -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient from sound_play.msg import SoundRequest diff --git a/sound_play/scripts/test.py b/sound_play/scripts/test.py index 4c50a800..193facf7 100755 --- a/sound_play/scripts/test.py +++ b/sound_play/scripts/test.py @@ -39,7 +39,7 @@ import rclpy -from sound_play.libsoundplay import SoundClient +from sound_play_py.libsoundplay import SoundClient from sound_play.msg import SoundRequest diff --git a/sound_play/sound_play/__init__.py b/sound_play/sound_play_py/__init__.py similarity index 100% rename from sound_play/sound_play/__init__.py rename to sound_play/sound_play_py/__init__.py diff --git a/sound_play/sound_play/libsoundplay.py b/sound_play/sound_play_py/libsoundplay.py similarity index 100% rename from sound_play/sound_play/libsoundplay.py rename to sound_play/sound_play_py/libsoundplay.py