[Personalrobots-commit] SF.net SVN: personalrobots:[7958] pkg/trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7958
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7958&view=rev
Author:   hsujohnhsu
Date:     2008-12-11 04:16:49 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
bug fix in launch scripts $LD_LIBRARY_PATH -> $(env LD_LIBRARY_PATH)

Modified Paths:
--------------
    pkg/trunk/3rdparty/gazebo/empty_world.launch
    pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox
    pkg/trunk/drivers/simulator/gazebo_plugin/test/testcameras.xml
    pkg/trunk/drivers/simulator/gazebo_plugin/test/testscan.xml
    pkg/trunk/drivers/simulator/gazebo_plugin/test/testslide.xml

Modified: pkg/trunk/3rdparty/gazebo/empty_world.launch
===================================================================

--- pkg/trunk/3rdparty/gazebo/empty_world.launch	2008-12-11 03:37:55 UTC (rev 7957)
+++ pkg/trunk/3rdparty/gazebo/empty_world.launch	2008-12-11 04:16:49 UTC (rev 7958)
@@ -3,7 +3,7 @@
   <group name="wg">
     <!-- start gazebo -->
     <node pkg="gazebo" type="gazebo" args="-n $(find gazebo_robot_description)/gazebo_worlds/empty.world" respawn="false" output="screen">
-      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$LD_LIBRARY_PATH" />
+      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$(env LD_LIBRARY_PATH)" />
       <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
       <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
       <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox	2008-12-11 03:37:55 UTC (rev 7957)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/doc.dox	2008-12-11 04:16:49 UTC (rev 7958)
@@ -30,7 +30,7 @@
     <group name="wg">
       <!-- assign environment variables for gazebo and startup gazebo with argument containing the world file.  -->
       <node pkg="gazebo" type="gazebo" args="-n $(find gazebo_robot_description)/world/robot.world" respawn="false" output="screen">
-        <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$LD_LIBRARY_PATH" />
+        <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(env LD_LIBRARY_PATH)" />
         <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
         <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
         <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
@@ -257,7 +257,7 @@
         <group name="wg">
           <param name="robotdesc/pr2" command="$(find wg_robot_description_parser)/merge &quot;$(find wg_robot_description)/single_link_test/pr2_single_link.xml&quot;" />
           <node pkg="gazebo" type="gazebo" args="$(find gazebo_robot_description)/world/robot_single_link.world" respawn="false" output="screen">
-            <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$LD_LIBRARY_PATH" />
+            <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(env LD_LIBRARY_PATH)" />
             <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
             <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
             <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/test/testcameras.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/test/testcameras.xml	2008-12-11 03:37:55 UTC (rev 7957)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/test/testcameras.xml	2008-12-11 04:16:49 UTC (rev 7958)
@@ -2,7 +2,7 @@
   <master auto="start" />
 
     <node pkg="gazebo" type="gazebo" args="-n $(find gazebo_robot_description)/gazebo_worlds/test/testcameras.world" respawn="false" output="screen">
-      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$LD_LIBRARY_PATH" />
+      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$(env LD_LIBRARY_PATH)" />
       <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
       <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
       <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/test/testscan.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/test/testscan.xml	2008-12-11 03:37:55 UTC (rev 7957)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/test/testscan.xml	2008-12-11 04:16:49 UTC (rev 7958)
@@ -2,7 +2,7 @@
   <master auto="start" />
 
     <node pkg="gazebo" type="gazebo" args="-r $(find gazebo_robot_description)/gazebo_worlds/test/testscan.world" respawn="false" output="screen">
-      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$LD_LIBRARY_PATH" />
+      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$(env LD_LIBRARY_PATH)" />
       <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
       <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
       <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />

Modified: pkg/trunk/drivers/simulator/gazebo_plugin/test/testslide.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/test/testslide.xml	2008-12-11 03:37:55 UTC (rev 7957)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/test/testslide.xml	2008-12-11 04:16:49 UTC (rev 7958)
@@ -2,7 +2,7 @@
   <master auto="start" />
 
     <node pkg="gazebo" type="gazebo" args="-r $(find gazebo_robot_description)/gazebo_worlds/test/testslide.world" respawn="false" output="screen">
-      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$LD_LIBRARY_PATH" />
+      <env name="LD_LIBRARY_PATH" value="$(find gazebo_plugin)/lib:$(find gazebo)/gazebo/lib:$(find Cg)/Cg/lib:$(find boost)/boost/lib:$(env LD_LIBRARY_PATH)" />
       <env name="GAZEBO_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />
       <env name="OGRE_RESOURCE_PATH" value="$(find ogre)/ogre/lib/OGRE" />
       <env name="MC_RESOURCE_PATH" value="$(find gazebo_robot_description)/world" />


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


