Menu
▾
▴
[Personalrobots-commit] SF.net SVN: personalrobots:[2952] pkg/trunk
|
From: <hsu...@us...> - 2008-08-12 20:21:45
|
Revision: 2952
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=2952&view=rev
Author: hsujohnhsu
Date: 2008-08-12 20:21:54 +0000 (Tue, 12 Aug 2008)
Log Message:
-----------
moved setup scripts inside of gazebo.
updated related run-gazebo.sh and run-rosgazebo.sh scripts.
Modified Paths:
--------------
pkg/trunk/3rdparty/gazebo/setup.bash
pkg/trunk/3rdparty/gazebo/setup.tcsh
pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh
pkg/trunk/robot_control_loops/pr2_gazebo/run-pr2_gazebo.sh
pkg/trunk/simulators/rosgazebo/run-rosgazebo.sh
Removed Paths:
-------------
pkg/trunk/robot_control_loops/pr2_gazebo/setup.bash
pkg/trunk/robot_control_loops/pr2_gazebo/setup.tcsh
pkg/trunk/simulators/rosgazebo/run-gazebo.sh
Modified: pkg/trunk/3rdparty/gazebo/setup.bash
===================================================================
--- pkg/trunk/3rdparty/gazebo/setup.bash 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/3rdparty/gazebo/setup.bash 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,19 +1,18 @@
#!/bin/bash
export GAZ_TOP=`rospack find gazebo`/gazebo
export OGRE_TOP=`rospack find ogre`/ogre
+export CG_TOP=`rospack find Cg`/Cg
export SIM_PLUGIN=`rospack find gazebo_plugin`
-export PR2API=`rospack find libpr2API`
-export PR2HW=`rospack find libpr2HW`
-export PR2MEDIA=`rospack find 2dnav-gazebo`/world
+export PR2MEDIA=`rospack find gazebo_robot_description`/world
-export LD_LIBRARY_PATH ''
-export LD_LIBRARY_PATH=$PR2API/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$PR2HW/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=''
export LD_LIBRARY_PATH=$SIM_PLUGIN/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$GAZ_TOP/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$OGRE_TOP/lib:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$OGRE_TOP/lib/OGRE:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$CG_TOP/lib:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=$SIM_PLUGIN/lib:$LD_LIBRARY_PATH
export PATH=$GAZ_TOP/bin:$PATH
export GAZEBO_RESOURCE_PATH=$PR2MEDIA
Modified: pkg/trunk/3rdparty/gazebo/setup.tcsh
===================================================================
--- pkg/trunk/3rdparty/gazebo/setup.tcsh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/3rdparty/gazebo/setup.tcsh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,19 +1,18 @@
#!/bin/tcsh
setenv GAZ_TOP `rospack find gazebo`/gazebo
setenv OGRE_TOP `rospack find ogre`/ogre
+setenv CG_TOP `rospack find Cg`/Cg
setenv SIM_PLUGIN `rospack find gazebo_plugin`
-setenv PR2API `rospack find libpr2API`
-setenv PR2HW `rospack find libpr2HW`
-setenv PR2MEDIA `rospack find 2dnav-gazebo`/world
+setenv PR2MEDIA `rospack find gazebo_robot_description`/world
if (! $?LD_LIBRARY_PATH) setenv LD_LIBRARY_PATH ''
setenv LD_LIBRARY_PATH ''
-setenv LD_LIBRARY_PATH $PR2API/lib:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $PR2HW/lib:$LD_LIBRARY_PATH
setenv LD_LIBRARY_PATH $SIM_PLUGIN/lib:$LD_LIBRARY_PATH
setenv LD_LIBRARY_PATH $GAZ_TOP/lib:$LD_LIBRARY_PATH
setenv LD_LIBRARY_PATH $OGRE_TOP/lib:$LD_LIBRARY_PATH
setenv LD_LIBRARY_PATH $OGRE_TOP/lib/OGRE:$LD_LIBRARY_PATH
+setenv LD_LIBRARY_PATH $CG_TOP/lib:$LD_LIBRARY_PATH
+setenv LD_LIBRARY_PATH $SIM_PLUGIN/lib:$LD_LIBRARY_PATH
setenv PATH $GAZ_TOP/bin:$PATH
setenv GAZEBO_RESOURCE_PATH $PR2MEDIA
Modified: pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh
===================================================================
--- pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/robot_control_loops/pr2_gazebo/run-gazebo.sh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,3 +1,3 @@
#!/bin/bash
-. `rospack find pr2_gazebo`/setup.bash
+. `rospack find gazebo`/setup.bash
gazebo $*
Modified: pkg/trunk/robot_control_loops/pr2_gazebo/run-pr2_gazebo.sh
===================================================================
--- pkg/trunk/robot_control_loops/pr2_gazebo/run-pr2_gazebo.sh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/robot_control_loops/pr2_gazebo/run-pr2_gazebo.sh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,3 +1,3 @@
#!/bin/bash
-. `rospack find pr2_gazebo`/setup.bash
+. `rospack find gazebo`/setup.bash
`rospack find pr2_gazebo`/pr2_gazebo
Deleted: pkg/trunk/robot_control_loops/pr2_gazebo/setup.bash
===================================================================
--- pkg/trunk/robot_control_loops/pr2_gazebo/setup.bash 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/robot_control_loops/pr2_gazebo/setup.bash 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,27 +0,0 @@
-#!/bin/bash
-export GAZ_TOP=`rospack find gazebo`/gazebo
-export OGRE_TOP=`rospack find ogre`/ogre
-export CG_TOP=`rospack find Cg`/Cg
-export SIM_PLUGIN=`rospack find gazebo_plugin`
-export PR2MEDIA=`rospack find gazebo_robot_description`/world
-
-
-export LD_LIBRARY_PATH=''
-export LD_LIBRARY_PATH=$SIM_PLUGIN/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$GAZ_TOP/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$OGRE_TOP/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$OGRE_TOP/lib/OGRE:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$CG_TOP/lib:$LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=$SIM_PLUGIN/lib:$LD_LIBRARY_PATH
-export PATH=$GAZ_TOP/bin:$PATH
-
-export GAZEBO_RESOURCE_PATH=$PR2MEDIA
-export OGRE_RESOURCE_PATH=$OGRE_TOP/lib/OGRE
-
-echo
-echo Current GAZ_TOP is set to $GAZ_TOP
-echo Paths have been set accordingly.
-echo
-echo Now run gazebo [...world file...]
-echo
-
Deleted: pkg/trunk/robot_control_loops/pr2_gazebo/setup.tcsh
===================================================================
--- pkg/trunk/robot_control_loops/pr2_gazebo/setup.tcsh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/robot_control_loops/pr2_gazebo/setup.tcsh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,27 +0,0 @@
-#!/bin/tcsh
-setenv GAZ_TOP `rospack find gazebo`/gazebo
-setenv OGRE_TOP `rospack find ogre`/ogre
-setenv CG_TOP `rospack find Cg`/Cg
-setenv SIM_PLUGIN `rospack find gazebo_plugin`
-setenv PR2MEDIA `rospack find gazebo_robot_description`/world
-
-if (! $?LD_LIBRARY_PATH) setenv LD_LIBRARY_PATH ''
-setenv LD_LIBRARY_PATH ''
-setenv LD_LIBRARY_PATH $SIM_PLUGIN/lib:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $GAZ_TOP/lib:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $OGRE_TOP/lib:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $OGRE_TOP/lib/OGRE:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $CG_TOP/lib:$LD_LIBRARY_PATH
-setenv LD_LIBRARY_PATH $SIM_PLUGIN/lib:$LD_LIBRARY_PATH
-setenv PATH $GAZ_TOP/bin:$PATH
-
-setenv GAZEBO_RESOURCE_PATH $PR2MEDIA
-setenv OGRE_RESOURCE_PATH $OGRE_TOP/lib/OGRE
-
-echo
-echo Current GAZ_TOP is set to $GAZ_TOP
-echo Paths have been set accordingly.
-echo
-echo Now run gazebo [...world file...]
-echo
-
Deleted: pkg/trunk/simulators/rosgazebo/run-gazebo.sh
===================================================================
--- pkg/trunk/simulators/rosgazebo/run-gazebo.sh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/simulators/rosgazebo/run-gazebo.sh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,3 +0,0 @@
-#!/bin/bash
-. ./setup.bash
-gazebo $*
Modified: pkg/trunk/simulators/rosgazebo/run-rosgazebo.sh
===================================================================
--- pkg/trunk/simulators/rosgazebo/run-rosgazebo.sh 2008-08-12 19:49:49 UTC (rev 2951)
+++ pkg/trunk/simulators/rosgazebo/run-rosgazebo.sh 2008-08-12 20:21:54 UTC (rev 2952)
@@ -1,3 +1,3 @@
#!/bin/bash
-. `rospack find rosgazebo`/setup.bash
+. `rospack find gazebo`/setup.bash
`rospack find rosgazebo`/rosgazebo $*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
