Fix Python Packages for latest Catkin

see: ros/catkin#756
b-it-bots · Feb 20, 2016 · 6cd5060 · 6cd5060
1 parent 3ae2522
commit 6cd5060
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)