[Personalrobots-commit] SF.net SVN: personalrobots:[21834] pkg/trunk/stacks/pr2/pr2_alpha

[<stu...@us...>]

Revision: 21834
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=21834&view=rev
Author:   stuglaser
Date:     2009-08-13 21:17:47 +0000 (Thu, 13 Aug 2009)

Log Message:
-----------
Hacked prX.launch files to add rospack to the path for realtime-root.  This allows plugin loading
to work until ROS ticket #1586 is fixed.

Modified Paths:
--------------
    pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
    pkg/trunk/stacks/pr2/pr2_alpha/prf.machine
    pkg/trunk/stacks/pr2/pr2_alpha/prg.machine

Modified: pkg/trunk/stacks/pr2/pr2_alpha/pre.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/pre.machine	2009-08-13 21:17:19 UTC (rev 21833)
+++ pkg/trunk/stacks/pr2/pr2_alpha/pre.machine	2009-08-13 21:17:47 UTC (rev 21834)
@@ -1,5 +1,7 @@
 <launch>
-  <machine name="realtime_root" user="root" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never"/>
+  <machine name="realtime_root" user="root" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never">
+    <env name="PATH" value="$(env PATH):$(env ROS_ROOT)/bin" /> <!-- HACK.  Depends on ROS bug #1586.  Remove when closed -->
+  </machine>
 
   <machine name="realtime" address="pre1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="true"/>
   <machine name="two"      address="pre2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prf.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-08-13 21:17:19 UTC (rev 21833)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prf.machine	2009-08-13 21:17:47 UTC (rev 21834)
@@ -1,12 +1,14 @@
 <launch>
   <!-- Need realtime root machine for pr2_etherCAT -->
-  <machine name="realtime_root" user="root" address="prf1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
+  <machine name="realtime_root" user="root" address="prf1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never">
+    <env name="PATH" value="$(env PATH):$(env ROS_ROOT)/bin" /> <!-- HACK.  Depends on ROS bug #1586.  Remove when closed -->
+  </machine>
 
   <machine name="realtime" address="prf1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="two" address="prf2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)"  default="true" />
   <machine name="three" address="prf3" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="four"  address="prf4" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
-  
+
   <!-- Defines the machine that the Videre Stereocam is attached to -->
   <machine name="stereo"  address="prf4" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
 </launch>

Modified: pkg/trunk/stacks/pr2/pr2_alpha/prg.machine
===================================================================
--- pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-08-13 21:17:19 UTC (rev 21833)
+++ pkg/trunk/stacks/pr2/pr2_alpha/prg.machine	2009-08-13 21:17:47 UTC (rev 21834)
@@ -1,5 +1,7 @@
 <launch>
-  <machine name="realtime_root" user="root" address="prg1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never" />
+  <machine name="realtime_root" user="root" address="prg1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" default="never">
+    <env name="PATH" value="$(env PATH):$(env ROS_ROOT)/bin" /> <!-- HACK.  Depends on ROS bug #1586.  Remove when closed -->
+  </machine>
 
   <machine name="realtime" address="prg1" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)" />
   <machine name="two"      address="prg2" ros-root="$(env ROS_ROOT)" ros-package-path="$(env ROS_PACKAGE_PATH)"  default="true"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.