From 6cd506050ad1b6a5cbc2057a84219609521bc5bf Mon Sep 17 00:00:00 2001 From: moriarty Date: Sat, 20 Feb 2016 17:44:47 +0100 Subject: [PATCH] Fix Python Packages for latest Catkin see: https://github.com/ros/catkin/issues/756 --- mdr_behaviors/mdr_haptic/setup.py | 2 +- mdr_behaviors/mdr_simple_pickup/setup.py | 2 +- mdr_behaviors/mdr_simple_place/setup.py | 2 +- mdr_behaviors/mdr_tactile_grasp/setup.py | 4 ++-- mdr_manipulation/mdr_simple_grasp_planner/setup.py | 2 +- mdr_manipulation/mdr_tactile_tools/setup.py | 4 ++-- mdr_monitoring/mdr_audio_monitor/setup.py | 2 +- mdr_scenarios/mdr_common_states/setup.py | 2 +- mdr_scenarios/mdr_lab_demo/setup.py | 2 +- mdr_scenarios/mdr_pick_and_place/setup.py | 2 +- mdr_simulation/mdr_mockup_gui/setup.py | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mdr_behaviors/mdr_haptic/setup.py b/mdr_behaviors/mdr_haptic/setup.py index da5362d..e1963f9 100644 --- a/mdr_behaviors/mdr_haptic/setup.py +++ b/mdr_behaviors/mdr_haptic/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_haptic'], - package_dir={'mdr_haptic': 'ros/src'} + package_dir={'mdr_haptic': 'ros/src/mdr_haptic'} ) setup(**d) diff --git a/mdr_behaviors/mdr_simple_pickup/setup.py b/mdr_behaviors/mdr_simple_pickup/setup.py index ed8ed63..d2035a9 100644 --- a/mdr_behaviors/mdr_simple_pickup/setup.py +++ b/mdr_behaviors/mdr_simple_pickup/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_simple_pickup'], - package_dir={'': 'ros/src'} + package_dir={'mdr_simple_pickup': 'ros/src/mdr_simple_pickup'} ) setup(**d) diff --git a/mdr_behaviors/mdr_simple_place/setup.py b/mdr_behaviors/mdr_simple_place/setup.py index f332c25..231d641 100644 --- a/mdr_behaviors/mdr_simple_place/setup.py +++ b/mdr_behaviors/mdr_simple_place/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_simple_place'], - package_dir={'': 'ros/src'} + package_dir={'mdr_simple_place': 'ros/src/mdr_simple_place'} ) setup(**d) diff --git a/mdr_behaviors/mdr_tactile_grasp/setup.py b/mdr_behaviors/mdr_tactile_grasp/setup.py index 201b19d..f8e8350 100644 --- a/mdr_behaviors/mdr_tactile_grasp/setup.py +++ b/mdr_behaviors/mdr_tactile_grasp/setup.py @@ -5,8 +5,8 @@ d = generate_distutils_setup( packages=['mdr_tactile_grasp', 'mdr_tactile_grasp_common'], - package_dir={'mdr_tactile_grasp': 'ros/src', - 'mdr_tactile_grasp_common': 'common/src'} + package_dir={'mdr_tactile_grasp': 'ros/src/mdr_tactile_grasp', + 'mdr_tactile_grasp_common': 'common/src/mdr_tactile_grasp_common'} ) setup(**d) diff --git a/mdr_manipulation/mdr_simple_grasp_planner/setup.py b/mdr_manipulation/mdr_simple_grasp_planner/setup.py index 2e15c35..c4ef1d8 100644 --- a/mdr_manipulation/mdr_simple_grasp_planner/setup.py +++ b/mdr_manipulation/mdr_simple_grasp_planner/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_simple_grasp_planner'], - package_dir={'': 'ros/src'} + package_dir={'mdr_simple_grasp_planner': 'ros/src/mdr_simple_grasp_planner'} ) setup(**d) diff --git a/mdr_manipulation/mdr_tactile_tools/setup.py b/mdr_manipulation/mdr_tactile_tools/setup.py index 73c9979..12ed8b7 100644 --- a/mdr_manipulation/mdr_tactile_tools/setup.py +++ b/mdr_manipulation/mdr_tactile_tools/setup.py @@ -5,8 +5,8 @@ d = generate_distutils_setup( packages=['mdr_tactile_tools', 'mdr_tactile_tools_common'], - package_dir={'mdr_tactile_tools': 'ros/src', - 'mdr_tactile_tools_common': 'common/src'} + package_dir={'mdr_tactile_tools': 'ros/src/mdr_tactile_tools', + 'mdr_tactile_tools_common': 'common/src/mdr_tactile_tools_common'} ) setup(**d) diff --git a/mdr_monitoring/mdr_audio_monitor/setup.py b/mdr_monitoring/mdr_audio_monitor/setup.py index 698f9ed..66acdec 100644 --- a/mdr_monitoring/mdr_audio_monitor/setup.py +++ b/mdr_monitoring/mdr_audio_monitor/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_audio_monitor'], - package_dir={'': 'ros/src'} + package_dir={'mdr_audio_monitor': 'ros/src/mdr_audio_monitor'} ) setup(**d) diff --git a/mdr_scenarios/mdr_common_states/setup.py b/mdr_scenarios/mdr_common_states/setup.py index 03f29b3..9fea5bd 100644 --- a/mdr_scenarios/mdr_common_states/setup.py +++ b/mdr_scenarios/mdr_common_states/setup.py @@ -5,7 +5,7 @@ d = catkin_pkg.python_setup.generate_distutils_setup( packages=['mdr_common_states'], - package_dir={'mdr_common_states': 'ros/src'} + package_dir={'mdr_common_states': 'ros/src/mdr_common_states'} ) distutils.core.setup(**d) diff --git a/mdr_scenarios/mdr_lab_demo/setup.py b/mdr_scenarios/mdr_lab_demo/setup.py index 3aea0a7..7a56d6b 100644 --- a/mdr_scenarios/mdr_lab_demo/setup.py +++ b/mdr_scenarios/mdr_lab_demo/setup.py @@ -5,7 +5,7 @@ d = catkin_pkg.python_setup.generate_distutils_setup( packages=['mdr_lab_demo'], - package_dir={'mdr_lab_demo': 'ros/src'} + package_dir={'mdr_lab_demo': 'ros/src/mdr_lab_demo'} ) distutils.core.setup(**d) diff --git a/mdr_scenarios/mdr_pick_and_place/setup.py b/mdr_scenarios/mdr_pick_and_place/setup.py index 9745998..9f98e0c 100644 --- a/mdr_scenarios/mdr_pick_and_place/setup.py +++ b/mdr_scenarios/mdr_pick_and_place/setup.py @@ -5,7 +5,7 @@ d = catkin_pkg.python_setup.generate_distutils_setup( packages=['mdr_pick_and_place'], - package_dir={'mdr_pick_and_place': 'ros/src'} + package_dir={'mdr_pick_and_place': 'ros/src/mdr_pick_and_place'} ) distutils.core.setup(**d) diff --git a/mdr_simulation/mdr_mockup_gui/setup.py b/mdr_simulation/mdr_mockup_gui/setup.py index 5c222ef..e34759e 100644 --- a/mdr_simulation/mdr_mockup_gui/setup.py +++ b/mdr_simulation/mdr_mockup_gui/setup.py @@ -5,7 +5,7 @@ d = generate_distutils_setup( packages=['mdr_mockup_gui'], - package_dir={'': 'ros/src'} + package_dir={'mdr_mockup_gui': 'ros/src/mdr_mockup_gui'} ) setup(**d)