Author: hsu
Date: 2012-04-24 14:30:39 -0700 (Tue, 24 Apr 2012)
New Revision: 39337
Modified:
stacks/simulator_gazebo/trunk/gazebo/manifest.xml
stacks/simulator_gazebo/trunk/gazebo/scripts/debug
stacks/simulator_gazebo/trunk/gazebo/scripts/gazebo
stacks/simulator_gazebo/trunk/gazebo/scripts/gui
stacks/simulator_gazebo/trunk/gazebo/scripts/perf
Log:
per updates to gazebo trunk 1.0.1
Modified: stacks/simulator_gazebo/trunk/gazebo/manifest.xml
===================================================================
--- stacks/simulator_gazebo/trunk/gazebo/manifest.xml 2012-04-24 16:48:20 UTC (rev 39336)
+++ stacks/simulator_gazebo/trunk/gazebo/manifest.xml 2012-04-24 21:30:39 UTC (rev 39337)
@@ -24,8 +24,8 @@
<export>
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lurdf2gazebo `xml2-config --libs` `rosboost-cfg --lflags thread,signals` `fltk-config --use-gl --ldflags` -lfreeimage `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --libs gazebo` `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --libs gazebo_transport` `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --libs gazebo_ode`" cflags="-I${prefix}/include `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --cflags gazebo` `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --cflags gazebo_ode` `PKG_CONFIG_PATH=${prefix}/gazebo/lib/pkgconfig pkg-config --cflags gazebo_transport`"/>
<doxymaker external="http://playerstage.sourceforge.net/doc/Gazebo-manual-svn-html/"/>
- <gazebo gazebo_media_path="${prefix}/gazebo/share/gazebo-1.0.0" />
- <gazebo plugin_path="${prefix}/gazebo/lib/gazebo-1.0.0/plugins" />
+ <gazebo gazebo_media_path="${prefix}/gazebo/share/gazebo-1.0.1" />
+ <gazebo plugin_path="${prefix}/gazebo/lib/gazebo-1.0.1/plugins" />
</export>
<versioncontrol type="svn" url="https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/gazebo/trunk"/>
<depend package="roslib" />
Modified: stacks/simulator_gazebo/trunk/gazebo/scripts/debug
===================================================================
--- stacks/simulator_gazebo/trunk/gazebo/scripts/debug 2012-04-24 16:48:20 UTC (rev 39336)
+++ stacks/simulator_gazebo/trunk/gazebo/scripts/debug 2012-04-24 21:30:39 UTC (rev 39337)
@@ -13,7 +13,7 @@
done
if [ -z "$final" ] #if no arguments are given, default to empty world
then
- `rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
+ `rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
else
- `rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
+ `rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
fi
Modified: stacks/simulator_gazebo/trunk/gazebo/scripts/gazebo
===================================================================
--- stacks/simulator_gazebo/trunk/gazebo/scripts/gazebo 2012-04-24 16:48:20 UTC (rev 39336)
+++ stacks/simulator_gazebo/trunk/gazebo/scripts/gazebo 2012-04-24 21:30:39 UTC (rev 39337)
@@ -13,7 +13,7 @@
done
if [ -z "$final" ] #if no arguments are given, default to empty world
then
- `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
+ `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
else
- `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
+ `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
fi
Modified: stacks/simulator_gazebo/trunk/gazebo/scripts/gui
===================================================================
--- stacks/simulator_gazebo/trunk/gazebo/scripts/gui 2012-04-24 16:48:20 UTC (rev 39336)
+++ stacks/simulator_gazebo/trunk/gazebo/scripts/gui 2012-04-24 21:30:39 UTC (rev 39337)
@@ -1,4 +1,4 @@
#!/bin/bash
-`rospack find gazebo`/gazebo/bin/gzclient -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
-#glc-capture `rospack find gazebo`/gazebo/bin/gzclient -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
-#`rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzclient -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
+`rospack find gazebo`/gazebo/bin/gzclient -g `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
+#glc-capture `rospack find gazebo`/gazebo/bin/gzclient -g `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
+#`rospack find gazebo_worlds`/scripts/gdbrun `rospack find gazebo`/gazebo/bin/gzclient -g `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so
Modified: stacks/simulator_gazebo/trunk/gazebo/scripts/perf
===================================================================
--- stacks/simulator_gazebo/trunk/gazebo/scripts/perf 2012-04-24 16:48:20 UTC (rev 39336)
+++ stacks/simulator_gazebo/trunk/gazebo/scripts/perf 2012-04-24 21:30:39 UTC (rev 39337)
@@ -13,7 +13,7 @@
done
if [ -z "$final" ] #if no arguments are given, default to empty world
then
- /usr/bin/valgrind --tool=callgrind `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
+ /usr/bin/valgrind --tool=callgrind `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so `rospack find gazebo_worlds`/worlds/empty.world
else
- /usr/bin/valgrind --tool=callgrind `rospack find gazebo`/gazebo/bin/gzserver -p `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -p `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
+ /usr/bin/valgrind --tool=callgrind `rospack find gazebo`/gazebo/bin/gzserver -s `rospack find gazebo`/lib/libgazebo_ros_paths_plugin.so -s `rospack find gazebo`/lib/libgazebo_ros_api_plugin.so $final
fi
_______________________________________________
Ros-pkg-commits mailing list
Ros-pkg-commits@code.ros.org
https://code.ros.org/mailman/listinfo/ros-pkg-commits
(text/plain)
