From f277fab35528aa5da81da5336b4a6b444e086527 Mon Sep 17 00:00:00 2001 From: Raffa Date: Mon, 14 Mar 2016 14:45:52 +0100 Subject: [PATCH 1/6] add sound_play message dependency --- package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/package.xml b/package.xml index 5fcf8147..b4034cd1 100644 --- a/package.xml +++ b/package.xml @@ -43,6 +43,7 @@ rocon_std_msgs rocon_tutorial_msgs scheduler_msgs + sound_play world_canvas_msgs map_store # ros-planning/map_store move_base_msgs # ros-planning/navigation From a3c0aac822f72574f646165b011ef376349c46ac Mon Sep 17 00:00:00 2001 From: Raffa Date: Mon, 14 Mar 2016 14:46:22 +0100 Subject: [PATCH 2/6] add sound_play message dependency --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a495bf14..9bd2a581 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ generate_rosjava_messages( scheduler_msgs move_base_msgs # ros-planning/navigation map_store # ros-planning/map_store - + sound_play roscpp # !!!!!!! REMOVE THIS ONCE https://github.com/ros-planning/navigation/pull/312 is fixed! !!!!!!!! ) From 52e4f8282c5ec490f7ae5dc1afe2399b10ab879d Mon Sep 17 00:00:00 2001 From: Raffa Date: Mon, 14 Mar 2016 14:52:56 +0100 Subject: [PATCH 3/6] add audio_common --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9bd2a581..f7b9e0c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ generate_rosjava_messages( scheduler_msgs move_base_msgs # ros-planning/navigation map_store # ros-planning/map_store + audio_common_msgs sound_play roscpp # !!!!!!! REMOVE THIS ONCE https://github.com/ros-planning/navigation/pull/312 is fixed! !!!!!!!! ) From a34b54440a7db4d283547f02adaae25bd5377c5f Mon Sep 17 00:00:00 2001 From: Raffa Date: Mon, 14 Mar 2016 14:54:14 +0100 Subject: [PATCH 4/6] add audio_common --- package.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/package.xml b/package.xml index b4034cd1..989435aa 100644 --- a/package.xml +++ b/package.xml @@ -43,6 +43,7 @@ rocon_std_msgs rocon_tutorial_msgs scheduler_msgs + audio_common_msgs sound_play world_canvas_msgs map_store # ros-planning/map_store From 17987fa13b060c70db028511a4a34885e10cecb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20D=C3=BCrscheid?= Date: Thu, 24 Mar 2016 09:26:50 +0100 Subject: [PATCH 5/6] Add all message dependencies of dialogue_java --- CMakeLists.txt | 7 +++++++ package.xml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7b9e0c1..3af41212 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,6 +47,13 @@ generate_rosjava_messages( audio_common_msgs sound_play roscpp # !!!!!!! REMOVE THIS ONCE https://github.com/ros-planning/navigation/pull/312 is fixed! !!!!!!!! + face_detection_msgs + face_detection_srvs + speech_synthesis_srvs + speech_recognition_msgs + rest_srvs + skill_srvs + hermes_srvs ) catkin_package() diff --git a/package.xml b/package.xml index 989435aa..541e8dd3 100644 --- a/package.xml +++ b/package.xml @@ -43,6 +43,13 @@ rocon_std_msgs rocon_tutorial_msgs scheduler_msgs + face_detection_msgs + face_detection_srvs + speech_synthesis_srvs + speech_recognition_msgs + rest_srvs + skill_srvs + hermes_srvs audio_common_msgs sound_play world_canvas_msgs From c3ea0b88e7457b7627fbe301638b30c7ab106723 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raphael=20D=C3=BCrscheid?= Date: Thu, 24 Mar 2016 12:16:04 +0100 Subject: [PATCH 6/6] Revert "Add all message dependencies of dialogue_java" This reverts commit 17987fa13b060c70db028511a4a34885e10cecb7. --- CMakeLists.txt | 7 ------- package.xml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3af41212..f7b9e0c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,13 +47,6 @@ generate_rosjava_messages( audio_common_msgs sound_play roscpp # !!!!!!! REMOVE THIS ONCE https://github.com/ros-planning/navigation/pull/312 is fixed! !!!!!!!! - face_detection_msgs - face_detection_srvs - speech_synthesis_srvs - speech_recognition_msgs - rest_srvs - skill_srvs - hermes_srvs ) catkin_package() diff --git a/package.xml b/package.xml index 541e8dd3..989435aa 100644 --- a/package.xml +++ b/package.xml @@ -43,13 +43,6 @@ rocon_std_msgs rocon_tutorial_msgs scheduler_msgs - face_detection_msgs - face_detection_srvs - speech_synthesis_srvs - speech_recognition_msgs - rest_srvs - skill_srvs - hermes_srvs audio_common_msgs sound_play world_canvas_msgs