Menu
▾
▴
personalrobots-commit
|
From: <tf...@us...> - 2009-06-23 19:07:59
|
Revision: 17522
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17522&view=rev
Author: tfoote
Date: 2009-06-23 19:07:56 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
adding rosdep to all manifests in ros-pkg which have sysdepends but no rosdep tags, also clearing out all references to wget and subversion which are prerequisites
Modified Paths:
--------------
pkg/trunk/3rdparty/ANN/manifest.xml
pkg/trunk/3rdparty/asterisk/manifest.xml
pkg/trunk/3rdparty/cminpack/manifest.xml
pkg/trunk/3rdparty/eigen/manifest.xml
pkg/trunk/3rdparty/libdc1394v2/manifest.xml
pkg/trunk/3rdparty/libsunflower/manifest.xml
pkg/trunk/3rdparty/nepumuk/manifest.xml
pkg/trunk/3rdparty/neven/manifest.xml
pkg/trunk/3rdparty/ocl/manifest.xml
pkg/trunk/3rdparty/octave_forge/manifest.xml
pkg/trunk/3rdparty/opencv_latest/manifest.xml
pkg/trunk/3rdparty/player/manifest.xml
pkg/trunk/3rdparty/prosilica_gige_sdk/manifest.xml
pkg/trunk/3rdparty/python-twitter/manifest.xml
pkg/trunk/3rdparty/rtt/manifest.xml
pkg/trunk/3rdparty/sicktoolbox/manifest.xml
pkg/trunk/3rdparty/vop/manifest.xml
pkg/trunk/3rdparty/wxpropgrid/manifest.xml
pkg/trunk/controllers/qualification_controllers/dynamic_verification_controllers/manifest.xml
pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
pkg/trunk/deprecated/newmat10/manifest.xml
pkg/trunk/drivers/cam/dcam/manifest.xml
pkg/trunk/drivers/network/wifi_ddwrt/manifest.xml
pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
pkg/trunk/drivers/ups/apcupsd_node/manifest.xml
pkg/trunk/estimation/bfl/manifest.xml
pkg/trunk/hardware_test/runtime_monitor/manifest.xml
pkg/trunk/motion_planning/mpbench/manifest.xml
pkg/trunk/pr2/dynamic_verification/manifest.xml
pkg/trunk/pr2/motorconf_gui/manifest.xml
pkg/trunk/pr2/pr2_computer_monitor/manifest.xml
pkg/trunk/pr2/qualification/manifest.xml
pkg/trunk/vision/image_synthesizer/manifest.xml
pkg/trunk/vision/jpeg/manifest.xml
pkg/trunk/vision/outlet_detection/manifest.xml
pkg/trunk/vision/people/manifest.xml
pkg/trunk/vision/place_recognition/manifest.xml
pkg/trunk/vision/star_detector/manifest.xml
pkg/trunk/vision/vslam/manifest.xml
pkg/trunk/visualization/pr2_dashboard/manifest.xml
pkg/trunk/visualization/rviz/manifest.xml
pkg/trunk/visualization_core/Cg/manifest.xml
pkg/trunk/visualization_core/freeimage/manifest.xml
Modified: pkg/trunk/3rdparty/ANN/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/ANN/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/ANN/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -36,8 +36,4 @@
<cpp cflags="-I${prefix}/build/ann_1.1.1/include" lflags="-Wl,-rpath,${prefix}/build/ann_1.1.1/lib -L${prefix}/build/ann_1.1.1/lib -lANN" />
<doxymaker external="http://www.cs.umd.edu/~mount/ANN/Files/1.1.1/ANNmanual_1.1.1.pdf"/>
</export>
-
- <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
-
</package>
Modified: pkg/trunk/3rdparty/asterisk/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/asterisk/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/asterisk/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -12,7 +12,4 @@
<depend package="rospy" />
<depend package="std_msgs" />
- <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
-
</package>
Modified: pkg/trunk/3rdparty/cminpack/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/cminpack/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/cminpack/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -61,7 +61,4 @@
<cpp cflags="-I${prefix}/build/cminpack-1.0.2" lflags="-Wl,-rpath,${prefix}/build/cminpack-1.0.2 -L${prefix}/build/cminpack-1.0.2 -lminpack" />
</export>
- <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
-
</package>
Modified: pkg/trunk/3rdparty/eigen/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/eigen/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/eigen/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -61,8 +61,4 @@
<cpp cflags="-I${prefix}/build/eigen2" lflags="" />
<doxymaker external="http://eigen.tuxfamily.org/api/"/>
</export>
-
- <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
-
</package>
Modified: pkg/trunk/3rdparty/libdc1394v2/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/libdc1394v2/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/libdc1394v2/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -21,6 +21,9 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="autoconf"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libtool"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libtool"/>
+ <rosdep name="automake"/>
+ <rosdep name="autoconf"/>
+ <rosdep name="libtool"/>
<install>
<arch><pacman pkg="libdc1394"/></arch>
<intrepid><apt pkg="libdc1394-22-dev"/></intrepid>
Modified: pkg/trunk/3rdparty/libsunflower/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/libsunflower/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/libsunflower/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,6 +16,4 @@
<doxymaker external="http://libsunflower.sourceforge.net/"/>
</export>
<versioncontrol type="svn" url="https://libsunflower.svn.sourceforge.net/svnroot/libsunflower/trunk/sunflower"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/3rdparty/nepumuk/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/nepumuk/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/nepumuk/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,6 +16,10 @@
<sysdepend os="debian" version="4.0-etch" package="autoconf"/>
<sysdepend os="debian" version="4.0-etch" package="automake"/>
<sysdepend os="debian" version="4.0-etch" package="libtool"/>
+ <rosdep name="automake"/>
+ <rosdep name="autoconf"/>
+ <rosdep name="libtool"/>
+ <rosdep name="libpng"/>
<export>
<cpp cflags="-I${prefix}/local/include" lflags="-Wl,-rpath,${prefix}/local/lib -L${prefix}/local/lib -lsunflower" />
<doxymaker external="http://libsunflower.sourceforge.net/"/>
Modified: pkg/trunk/3rdparty/neven/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/neven/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/neven/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -12,7 +12,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="git"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="git"/>
-
+ <rosdep name="git"/>
<url>http://android.git.kernel.org/?p=platform/external/neven.git;a=summary</url>
<versioncontrol type="git" url="git://android.git.kernel.org/platform/external/neven.git"/>
</package>
Modified: pkg/trunk/3rdparty/ocl/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/ocl/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/ocl/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,15 +16,10 @@
<doxymaker external="http://www.orocos.org/ocl" />
</export>
<depend package="rtt" />
-<sysdepend os="ubuntu" version="7.04-feisty" package="subversion"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="subversion"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libreadline-dev"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="libreadline-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libreadline-dev"/>
-<!--sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/-->
-<!--sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/-->
-<!--sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/-->
-<!--sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/-->
+<rosdep name="libreadline"/>
<versioncontrol type="svn" url="http://svn.mech.kuleuven.be/repos/orocos/trunk/ocl"/>
</package>
Modified: pkg/trunk/3rdparty/octave_forge/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/octave_forge/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/octave_forge/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -17,7 +17,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="octave2.9-headers"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="octave3.0"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="octave3.0-headers"/>
-
+ <rosdep name="octave"/>
</package>
Modified: pkg/trunk/3rdparty/opencv_latest/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/opencv_latest/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/opencv_latest/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -29,5 +29,10 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libgraphicsmagick++1-dev"/>
<sysdepend os="ubuntu" version="9.04-jaunty" package="libswscale-dev"/>
<versioncontrol type="svn" url="https://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/tags/latest_tested_snapshot/opencv"/>
+<rosdep name="libavformat"/>
+<rosdep name="libavcodec"/>
+<rosdep name="libjasper"/>
+<rosdep name="libswscale"/>
+<rosdep name="libgraphicsmagick++"/>
</package>
Modified: pkg/trunk/3rdparty/player/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/player/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/player/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -18,6 +18,7 @@
</export>
<versioncontrol type="svn" url="https://playerstage.svn.sourceforge.net/svnroot/playerstage/code/player/trunk"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="pkg-config"/>
+<rosdep name="pkg-config"/>
<!-- <sysdepend os="debian" version="4.0-etch" package="libasound2-dev"/> -->
</package>
Modified: pkg/trunk/3rdparty/prosilica_gige_sdk/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/prosilica_gige_sdk/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/prosilica_gige_sdk/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,6 +11,4 @@
<export>
<cpp lflags="-Wl,-rpath,${prefix}/lib -L${prefix}/lib -lPvAPI" cflags="-I${prefix}/include"/>
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/3rdparty/python-twitter/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/python-twitter/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/python-twitter/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -8,4 +8,5 @@
<versioncontrol type="svn" url="http://python-twitter.googlecode.com/svn/trunk/"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-simplejson"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-simplejson"/>
+ <rosdep name="python-simplejson"/>
</package>
Modified: pkg/trunk/3rdparty/rtt/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/rtt/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/rtt/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -15,12 +15,6 @@
<cpp cflags="-I${prefix}/rtt/include -DOROCOS_TARGET=gnulinux" lflags="-Wl,-rpath,-L${prefix}/rtt/lib -lorocos-rtt-gnulinux -L${prefix}/rtt/lib -lpthread"/>
<doxymaker external="http://www.orocos.org/rtt" />
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="subversion"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="subversion"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="7.10-gutsy" package="libboost-dev=1.34.1-2ubuntu1"/>
-<sysdepend os="ubuntu" version="7.04-feisty" package="libboost-dev"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="libboost-dev"/>
<versioncontrol type="svn" url="http://svn.mech.kuleuven.be/repos/orocos/trunk/rtt"/>
</package>
Modified: pkg/trunk/3rdparty/sicktoolbox/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/sicktoolbox/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/sicktoolbox/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -12,7 +12,5 @@
<cpp lflags="-Wl,-rpath,${prefix}/sicktoolbox/lib -L${prefix}/sicktoolbox/lib -lsicklms-1.0" cflags="-I${prefix}/sicktoolbox/include"/>
<doxymaker external="http://sicktoolbox.sourceforge.net"/>
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/3rdparty/vop/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/vop/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/vop/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -7,7 +7,5 @@
<review status="3rdparty" notes=""/>
<export>
</export>
- <sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
- <sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/3rdparty/wxpropgrid/manifest.xml
===================================================================
--- pkg/trunk/3rdparty/wxpropgrid/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/3rdparty/wxpropgrid/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,5 +11,6 @@
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+<rosdep name="wxwidgets"/>
</package>
Modified: pkg/trunk/controllers/qualification_controllers/dynamic_verification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/dynamic_verification_controllers/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/controllers/qualification_controllers/dynamic_verification_controllers/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,6 +16,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
<cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ldynamic_verification_controllers'/>
Modified: pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/controllers/qualification_controllers/joint_qualification_controllers/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -18,6 +18,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
<repository>http://pr.willowgarage.com/repos</repository>
<export>
<cpp cflags='-I${prefix}/include -I${prefix}/msg/cpp -I${prefix}/srv/cpp' lflags='-Wl,-rpath,${prefix}/lib -L${prefix}/lib -ljoint_qualification_controllers'/>
Modified: pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml
===================================================================
--- pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/controllers/robot_mechanism_controllers/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -31,4 +31,5 @@
lflags="-Wl,-rpath,${prefix}/lib/ -L${prefix}/lib -lrobot_mechanism_controllers" />
</export>
<sysdepend os="ubuntu" version="8.04-hardy" package="libltdl3-dev"/>
+ <rosdep name="libtool"/>
</package>
Modified: pkg/trunk/deprecated/newmat10/manifest.xml
===================================================================
--- pkg/trunk/deprecated/newmat10/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/deprecated/newmat10/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,7 +16,5 @@
<cpp cflags="-I${prefix}/newmat" lflags="-L${prefix}/newmat/newmat10 -lnewmat" />
<doxymaker external="http://www.robertnz.net/nm_intro.htm"/>
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/drivers/cam/dcam/manifest.xml
===================================================================
--- pkg/trunk/drivers/cam/dcam/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/drivers/cam/dcam/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -20,6 +20,6 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libfltk1.1-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libfltk1.1-dev"/>
-
+ <rosdep name="fltk"/>
<url></url>
</package>
Modified: pkg/trunk/drivers/network/wifi_ddwrt/manifest.xml
===================================================================
--- pkg/trunk/drivers/network/wifi_ddwrt/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/drivers/network/wifi_ddwrt/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,5 +11,5 @@
<depend package="rostest" />
<sysdepend os="ubuntu" version="8.04-hardy" package="python-mechanize"/>
-
+ <rosdep name="python-mechanize"/>
</package>
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -37,4 +37,5 @@
<sysdepend os="ubuntu" version="9.04-jaunty" package="python-numpy"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-numpy"/>
<sysdepend os="ubuntu" version="7.10-gutsy" package="python-numpy"/>
+ <rosdep name="python-numpy"/>
</package>
Modified: pkg/trunk/drivers/ups/apcupsd_node/manifest.xml
===================================================================
--- pkg/trunk/drivers/ups/apcupsd_node/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/drivers/ups/apcupsd_node/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,6 +11,7 @@
<depend package="diagnostic_msgs"/>
<depend package="robot_msgs"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="apcupsd"/>
+ <rosdep name="apcupsd"/>
</package>
Modified: pkg/trunk/estimation/bfl/manifest.xml
===================================================================
--- pkg/trunk/estimation/bfl/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/estimation/bfl/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -17,9 +17,8 @@
<doxymaker external="http://orocos.org/bfl" />
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="subversion"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="subversion"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libcppunit-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libcppunit-dev"/>
+<rosdep name="cppunit"/>
</package>
Modified: pkg/trunk/hardware_test/runtime_monitor/manifest.xml
===================================================================
--- pkg/trunk/hardware_test/runtime_monitor/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/hardware_test/runtime_monitor/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -18,4 +18,6 @@
<sysdepend os="ubuntu" version="8.04-feisty" package="python-wxgtk2.8"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
</package>
Modified: pkg/trunk/motion_planning/mpbench/manifest.xml
===================================================================
--- pkg/trunk/motion_planning/mpbench/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/motion_planning/mpbench/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,4 +11,5 @@
<depend package="costmap_2d"/>
<depend package="door_msgs"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="libexpat1-dev"/>
+ <rosdep name="libexpat"/>
</package>
Modified: pkg/trunk/pr2/dynamic_verification/manifest.xml
===================================================================
--- pkg/trunk/pr2/dynamic_verification/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/pr2/dynamic_verification/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -25,4 +25,7 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-numpy"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-numpy"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
+ <rosdep name="python-numpy"/>
</package>
Modified: pkg/trunk/pr2/motorconf_gui/manifest.xml
===================================================================
--- pkg/trunk/pr2/motorconf_gui/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/pr2/motorconf_gui/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,4 +16,5 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="python-wxgtk2.8"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
+ <rosdep name="wxpython"/>
</package>
Modified: pkg/trunk/pr2/pr2_computer_monitor/manifest.xml
===================================================================
--- pkg/trunk/pr2/pr2_computer_monitor/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/pr2/pr2_computer_monitor/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -15,4 +15,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="ipmitool"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="hddtemp" />
<sysdepend os="ubuntu" version="8.04-hardy" package="hddtemp" />
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
+ <rosdep name="ipmitool"/>
+ <rosdep name="hddtemp"/>
</package>
Modified: pkg/trunk/pr2/qualification/manifest.xml
===================================================================
--- pkg/trunk/pr2/qualification/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/pr2/qualification/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -28,4 +28,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-matplotlib"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-matplotlib"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
+ <rosdep name="python-matplotlib"/>
+
</package>
Modified: pkg/trunk/vision/image_synthesizer/manifest.xml
===================================================================
--- pkg/trunk/vision/image_synthesizer/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/image_synthesizer/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -11,4 +11,5 @@
<depend package="stereo_utils"/>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-imaging"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-imaging"/>
+ <rosdep name="python-imaging"/>
</package>
Modified: pkg/trunk/vision/jpeg/manifest.xml
===================================================================
--- pkg/trunk/vision/jpeg/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/jpeg/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -23,5 +23,5 @@
<sysdepend os="ubuntu" version="9.04-jaunty" package="libjpeg62-dev"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="libjpeg62-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libjpeg62-dev"/>
-
+ <rosdep name="libjpeg"/>
</package>
Modified: pkg/trunk/vision/outlet_detection/manifest.xml
===================================================================
--- pkg/trunk/vision/outlet_detection/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/outlet_detection/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -41,4 +41,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="python-imaging"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-imaging"/>
<sysdepend os="ubuntu" version="8.10-intrepid" package="python-imaging"/>
+ <rosdep name="python-imaging"/>
+ <rosdep name="python-matplotlib"/>
+ <rosdep name="atlas"/>
</package>
Modified: pkg/trunk/vision/people/manifest.xml
===================================================================
--- pkg/trunk/vision/people/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/people/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -32,6 +32,7 @@
<depend package="visualization_msgs" />
<sysdepend os="ubuntu" version="7.04-feisty" package="python-numpy"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-numpy"/>
+<rosdep name="python-numpy"/>
<export>
<cpp cflags="-I${prefix}/msg/cpp"/>
</export>
Modified: pkg/trunk/vision/place_recognition/manifest.xml
===================================================================
--- pkg/trunk/vision/place_recognition/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/place_recognition/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -16,7 +16,7 @@
<!-- pylab, from matplotlib, is used in tests -->
<sysdepend os="ubuntu" version="8.04-hardy" package="python-matplotlib" />
<sysdepend os="ubuntu" version="7.10-gutsy" package="python-matplotlib" />
-
+ <rosdep name="python-matplotlib"/>
<export>
<cpp cflags="-I${prefix}/include" lflags=" -L${prefix}/lib -lstarfeature"/>
</export>
Modified: pkg/trunk/vision/star_detector/manifest.xml
===================================================================
--- pkg/trunk/vision/star_detector/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/star_detector/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -14,4 +14,5 @@
</export>
<sysdepend os="ubuntu" version="7.04-feisty" package="python-imaging"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-imaging"/>
+ <rosdep name="python-imaging"/>
</package>
Modified: pkg/trunk/vision/vslam/manifest.xml
===================================================================
--- pkg/trunk/vision/vslam/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/vision/vslam/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -22,6 +22,8 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="mayavi2"/>
<sysdepend os="ubuntu" version="8.10-Intrepid" package="mayavi2"/>
<sysdepend os="ubuntu" version="8.10-Intrepid" package="python-yaml"/>
+ <rosdep name="python-yaml"/>
+ <rosdep name="mayavi2"/>
<export>
<cpp cflags="-I${prefix}/msg/cpp" />
Modified: pkg/trunk/visualization/pr2_dashboard/manifest.xml
===================================================================
--- pkg/trunk/visualization/pr2_dashboard/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/visualization/pr2_dashboard/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -19,5 +19,7 @@
<sysdepend os="ubuntu" version="7.04-feisty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
</package>
Modified: pkg/trunk/visualization/rviz/manifest.xml
===================================================================
--- pkg/trunk/visualization/rviz/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/visualization/rviz/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -41,5 +41,7 @@
<sysdepend os="ubuntu" version="8.04-hardy" package="python-wxgtk2.8"/>
<sysdepend os="ubuntu" version="9.04-jaunty" package="libwxgtk2.8-dev"/>
<sysdepend os="ubuntu" version="9.04-jaunty" package="python-wxgtk2.8"/>
+ <rosdep name="wxwidgets"/>
+ <rosdep name="wxpython"/>
</package>
Modified: pkg/trunk/visualization_core/Cg/manifest.xml
===================================================================
--- pkg/trunk/visualization_core/Cg/manifest.xml 2009-06-23 19:05:34 UTC (rev 17521)
+++ pkg/trunk/visualization_core/Cg/manifest.xml 2009-06-23 19:07:56 UTC (rev 17522)
@@ -14,8 +14,6 @@
<cpp os="osx" lflags="" cflags=""/>
<doxymaker external="http://developer.nvidia.com/page/documentation.html"/>
</export>
-<sysdepend os="ubuntu" version="7.04-feisty" package="wget"/>
-<sysdepend os="ubuntu" version="8.04-hardy" package="wget"/>
</package>
Modified: pkg/trunk/visualization_core/freeimage/manifest.xml
========================...
[truncated message content] |
|
From: <tf...@us...> - 2009-06-23 21:15:18
|
Revision: 17546
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17546&view=rev
Author: tfoote
Date: 2009-06-23 21:15:17 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
filling geometery stack
Added Paths:
-----------
pkg/trunk/stacks/geometery/angles/
pkg/trunk/stacks/geometery/bullet/
pkg/trunk/stacks/geometery/eigen/
pkg/trunk/stacks/geometery/kdl/
pkg/trunk/stacks/geometery/tf/
pkg/trunk/stacks/geometery/tf/CMakeLists.txt
pkg/trunk/stacks/geometery/tf/scripts/
pkg/trunk/stacks/geometery/tf_conversions/
Removed Paths:
-------------
pkg/trunk/3rdparty/eigen/
pkg/trunk/3rdparty/kdl/
pkg/trunk/common/angles/
pkg/trunk/common/bullet/
pkg/trunk/common/tf/
pkg/trunk/stacks/geometery/tf/CMakeLists.txt
pkg/trunk/stacks/geometery/tf/reset_time.py
pkg/trunk/stacks/geometery/tf/simpletest.cpp
pkg/trunk/stacks/geometery/tf/viewFrames.py
pkg/trunk/util/tf_conversions/
Property changes on: pkg/trunk/stacks/geometery/angles
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/angles:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/geometery/bullet
___________________________________________________________________
Added: svn:ignore
+ bullet
bullet_svn
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/bullet:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/geometery/eigen
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/eigen:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/geometery/kdl
___________________________________________________________________
Added: svn:ignore
+ kdl
wiped
installed
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/kdl:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/geometery/tf
___________________________________________________________________
Added: svn:ignore
+ simpletest
tf_unittest
tf_unittest_future
cache_unittest
testListener
testBroadcaster
test_notifier
bullet_unittest
lib
build
btTest
transform_sender
frames.gv
frames.ps
frames.pdf
.build-version
.rosgcov_files
tf_monitor
bin
change_notifier
tf_echo
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/tf:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Deleted: pkg/trunk/stacks/geometery/tf/CMakeLists.txt
===================================================================
--- pkg/trunk/common/tf/CMakeLists.txt 2009-06-23 20:22:25 UTC (rev 17533)
+++ pkg/trunk/stacks/geometery/tf/CMakeLists.txt 2009-06-23 21:15:17 UTC (rev 17546)
@@ -1,109 +0,0 @@
-cmake_minimum_required(VERSION 2.4.6)
-include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-set(ROS_BUILD_TYPE Release)
-rospack(tf)
-
-rospack_add_boost_directories()
-
-genmsg()
-gensrv()
-
-rospack_add_library(tf src/tf.cpp src/transform_listener.cpp src/cache.cpp src/message_notifier.cpp src/transform_broadcaster.cpp)
-rospack_link_boost(tf thread)
-
-rospack_add_executable(tf_echo src/tf_echo.cpp)
-target_link_libraries(tf_echo tf)
-
-rospack_add_executable(change_notifier src/change_notifier.cpp)
-target_link_libraries(change_notifier tf)
-
-rospack_add_executable(tf_monitor src/tf_monitor.cpp)
-target_link_libraries(tf_monitor tf)
-
-rospack_add_executable(simpletest simpletest.cpp)
-target_link_libraries(simpletest tf)
-#rospack_add_executable(testtf src/test/testtf.cc)
-#target_link_libraries(testtf TF)
-#rospack_add_executable(test_interp src/test/test_interp.cc)
-#target_link_libraries(test_interp TF)
-#rospack_add_executable(testMatrix src/test/testMatrix.cc)
-#target_link_libraries(testMatrix TF)
-#rospack_add_executable(testMatrixQuaternion src/test/testMatrixQuaternion.cc)
-#target_link_libraries(testMatrixQuaternion TF)
-#rospack_add_gtest(pose3d_unittest test/pose3d_unittest.cpp src/Pose3D.cpp)
-#target_link_libraries(pose3d_unittest TF)
-rospack_add_gtest(test/tf_unittest test/tf_unittest.cpp)
-target_link_libraries(test/tf_unittest tf)
-rospack_add_gtest_future(test/tf_unittest_future test/tf_unittest_future.cpp)
-target_link_libraries(test/tf_unittest_future tf)
-rospack_add_gtest(test/cache_unittest test/cache_unittest.cpp)
-target_link_libraries(test/cache_unittest tf)
-
-rospack_add_gtest(test/test_permuter test/test_permuter.cpp)
-
-### Benchmarking
-rospack_add_gtest_future(test/tf_benchmark test/tf_benchmark.cpp)
-target_link_libraries(test/tf_benchmark tf)
-
-rospack_add_executable(btTest test/quaternion.cpp)
-rospack_add_executable(testListener test/testListener.cpp)
-target_link_libraries(testListener tf)
-
-rospack_add_executable(testBroadcaster test/testBroadcaster.cpp)
-target_link_libraries(testBroadcaster tf)
-rospack_add_executable(transform_sender src/transform_sender.cpp)
-target_link_libraries(transform_sender tf)
-
-rospack_add_executable(test_notifier EXCLUDE_FROM_ALL test/test_notifier.cpp)
-rospack_declare_test(test_notifier)
-rospack_add_gtest_build_flags(test_notifier)
-target_link_libraries(test_notifier tf ${Boost_LIBRARIES})
-rospack_add_rostest(test/test_notifier.xml)
-
-### python header for swig
-find_package(PythonLibs REQUIRED)
-include_directories(${PYTHON_INCLUDE_PATH})
-
-# Find the combined swig flags for this project
-_rospack_invoke(${PROJECT_NAME} ${PROJECT_NAME} SWIG_FLAGS "export" "--lang=swig" "--attrib=flags")
-set(SWIG_FLAGS ${${PROJECT_NAME}_SWIG_FLAGS})
-
-
-# Add a custom command for generating the swig output files
-set(SWIG_INTERFACE_FILE ${PROJECT_SOURCE_DIR}/swig/tf_swig.i)
-set(SWIG_OUTPUT_PYTHON_FILE ${PROJECT_SOURCE_DIR}/src/tf/tf_swig.py)
-
-# Deal with CMake 2.4 vs. 2.6
-if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) # CMake 2.6
- set(SWIG_OUTPUT_CPP_FILE ${PROJECT_SOURCE_DIR}/swig/tf_swig_wrap.cpp)
- set(SWIG_COMMAND swig ${SWIG_FLAGS} -o ${SWIG_OUTPUT_CPP_FILE} -outdir ${PROJECT_SOURCE_DIR}/src/tf -I${PROJECT_SOURCE_DIR}/build/include -module ${PROJECT_NAME}_swig ${SWIG_INTERFACE_FILE})
-else("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) # CMake 2.4
- set(SWIG_OUTPUT_CPP_FILE swig/tf_swig_wrap.cpp)
- set(SWIG_COMMAND swig ${SWIG_FLAGS} -o ../${SWIG_OUTPUT_CPP_FILE} -outdir ../src/tf -I../build/include -module ${PROJECT_NAME}_swig ${SWIG_INTERFACE_FILE})
-endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4)
-
-set_source_files_properties(${SWIG_OUTPUT_CPP_FILE} PROPERTIES GENERATED true)
-add_custom_command(OUTPUT ${SWIG_OUTPUT_CPP_FILE}
- ${SWIG_OUTPUT_PYTHON_FILE}
- COMMAND ${SWIG_COMMAND}
- DEPENDS ${SWIG_INTERFACE_FILE}
- swig/tf/tf_swig.h)
-
-# We add src/wx_rosout to the include list so that
-# ogre_tools_swig_generated.cpp can find its headers. This is part of a
-# workaround for a deficiency in CMake 2.4's handling of generated sources.
-#####include_directories(${PROJECT_SOURCE_DIR}/src/rxtools)
-# shared library (with SWIG)
-rospack_add_library(python_${PROJECT_NAME} ${SWIG_OUTPUT_CPP_FILE})
-target_link_libraries(python_${PROJECT_NAME} tf ${PYTHON_LIBRARIES})
-
-# swig python needs a shared library named _<modulename>.[so|dll|...]
-# this renames the output file to conform to that by prepending an underscore and removing the "lib" prefix
-set_target_properties(python_${PROJECT_NAME}
- PROPERTIES OUTPUT_NAME _${PROJECT_NAME}_swig
- PREFIX "")
-
-
-# Tests for swig
-rospack_add_pyunit_future(test/test_datatype_conversion.py)
-
Copied: pkg/trunk/stacks/geometery/tf/CMakeLists.txt (from rev 17542, pkg/trunk/common/tf/CMakeLists.txt)
===================================================================
--- pkg/trunk/stacks/geometery/tf/CMakeLists.txt (rev 0)
+++ pkg/trunk/stacks/geometery/tf/CMakeLists.txt 2009-06-23 21:15:17 UTC (rev 17546)
@@ -0,0 +1,97 @@
+cmake_minimum_required(VERSION 2.4.6)
+include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
+set(ROS_BUILD_TYPE Release)
+rospack(tf)
+
+rospack_add_boost_directories()
+
+genmsg()
+gensrv()
+
+rospack_add_library(tf src/tf.cpp src/transform_listener.cpp src/cache.cpp src/message_notifier.cpp src/transform_broadcaster.cpp)
+rospack_link_boost(tf thread)
+
+rospack_add_executable(bin/tf_echo src/tf_echo.cpp)
+target_link_libraries(bin/tf_echo tf)
+
+rospack_add_executable(bin/change_notifier src/change_notifier.cpp)
+target_link_libraries(bin/change_notifier tf)
+
+rospack_add_executable(bin/tf_monitor src/tf_monitor.cpp)
+target_link_libraries(bin/tf_monitor tf)
+
+rospack_add_gtest(test/tf_unittest test/tf_unittest.cpp)
+target_link_libraries(test/tf_unittest tf)
+rospack_add_gtest_future(test/tf_unittest_future test/tf_unittest_future.cpp)
+target_link_libraries(test/tf_unittest_future tf)
+rospack_add_gtest(test/cache_unittest test/cache_unittest.cpp)
+target_link_libraries(test/cache_unittest tf)
+
+rospack_add_gtest(test/test_permuter test/test_permuter.cpp)
+
+### Benchmarking
+rospack_add_gtest_future(test/tf_benchmark test/tf_benchmark.cpp)
+target_link_libraries(test/tf_benchmark tf)
+
+rospack_add_executable(test/btTest test/quaternion.cpp)
+rospack_add_executable(test/testListener test/testListener.cpp)
+target_link_libraries(test/testListener tf)
+
+rospack_add_executable(test/testBroadcaster test/testBroadcaster.cpp)
+target_link_libraries(test/testBroadcaster tf)
+rospack_add_executable(bin/transform_sender src/transform_sender.cpp)
+target_link_libraries(bin/transform_sender tf)
+
+rospack_add_executable(test/test_notifier EXCLUDE_FROM_ALL test/test_notifier.cpp)
+rospack_declare_test(test/test_notifier)
+rospack_add_gtest_build_flags(test/test_notifier)
+target_link_libraries(test/test_notifier tf ${Boost_LIBRARIES})
+rospack_add_rostest(test/test_notifier.xml)
+
+### python header for swig
+find_package(PythonLibs REQUIRED)
+include_directories(${PYTHON_INCLUDE_PATH})
+
+# Find the combined swig flags for this project
+_rospack_invoke(${PROJECT_NAME} ${PROJECT_NAME} SWIG_FLAGS "export" "--lang=swig" "--attrib=flags")
+set(SWIG_FLAGS ${${PROJECT_NAME}_SWIG_FLAGS})
+
+
+# Add a custom command for generating the swig output files
+set(SWIG_INTERFACE_FILE ${PROJECT_SOURCE_DIR}/swig/tf_swig.i)
+set(SWIG_OUTPUT_PYTHON_FILE ${PROJECT_SOURCE_DIR}/src/tf/tf_swig.py)
+
+# Deal with CMake 2.4 vs. 2.6
+if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) # CMake 2.6
+ set(SWIG_OUTPUT_CPP_FILE ${PROJECT_SOURCE_DIR}/swig/tf_swig_wrap.cpp)
+ set(SWIG_COMMAND swig ${SWIG_FLAGS} -o ${SWIG_OUTPUT_CPP_FILE} -outdir ${PROJECT_SOURCE_DIR}/src/tf -I${PROJECT_SOURCE_DIR}/build/include -module ${PROJECT_NAME}_swig ${SWIG_INTERFACE_FILE})
+else("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4) # CMake 2.4
+ set(SWIG_OUTPUT_CPP_FILE swig/tf_swig_wrap.cpp)
+ set(SWIG_COMMAND swig ${SWIG_FLAGS} -o ../${SWIG_OUTPUT_CPP_FILE} -outdir ../src/tf -I../build/include -module ${PROJECT_NAME}_swig ${SWIG_INTERFACE_FILE})
+endif("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.4)
+
+set_source_files_properties(${SWIG_OUTPUT_CPP_FILE} PROPERTIES GENERATED true)
+add_custom_command(OUTPUT ${SWIG_OUTPUT_CPP_FILE}
+ ${SWIG_OUTPUT_PYTHON_FILE}
+ COMMAND ${SWIG_COMMAND}
+ DEPENDS ${SWIG_INTERFACE_FILE}
+ swig/tf/tf_swig.h)
+
+# We add src/wx_rosout to the include list so that
+# ogre_tools_swig_generated.cpp can find its headers. This is part of a
+# workaround for a deficiency in CMake 2.4's handling of generated sources.
+#####include_directories(${PROJECT_SOURCE_DIR}/src/rxtools)
+# shared library (with SWIG)
+rospack_add_library(python_${PROJECT_NAME} ${SWIG_OUTPUT_CPP_FILE})
+target_link_libraries(python_${PROJECT_NAME} tf ${PYTHON_LIBRARIES})
+
+# swig python needs a shared library named _<modulename>.[so|dll|...]
+# this renames the output file to conform to that by prepending an underscore and removing the "lib" prefix
+set_target_properties(python_${PROJECT_NAME}
+ PROPERTIES OUTPUT_NAME _${PROJECT_NAME}_swig
+ PREFIX "")
+
+
+# Tests for swig
+rospack_add_pyunit_future(test/test_datatype_conversion.py)
+
Deleted: pkg/trunk/stacks/geometery/tf/reset_time.py
===================================================================
--- pkg/trunk/common/tf/reset_time.py 2009-06-23 20:22:25 UTC (rev 17533)
+++ pkg/trunk/stacks/geometery/tf/reset_time.py 2009-06-23 21:15:17 UTC (rev 17546)
@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of Willow Garage, Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-
-## Reset time
-
-import roslib; roslib.load_manifest('rospy_tutorials')
-
-import rospy
-from std_msgs.msg import Empty
-import time
-
-def reset_time():
- pub = rospy.Publisher('/reset_time', Empty)
- rospy.init_node('reset_time', anonymous=True)
- print "Resetting time"
- time.sleep(1)
- pub.publish(Empty())
-
-
-if __name__ == '__main__':
- reset_time()
Deleted: pkg/trunk/stacks/geometery/tf/simpletest.cpp
===================================================================
--- pkg/trunk/common/tf/simpletest.cpp 2009-06-23 20:22:25 UTC (rev 17533)
+++ pkg/trunk/stacks/geometery/tf/simpletest.cpp 2009-06-23 21:15:17 UTC (rev 17546)
@@ -1,33 +0,0 @@
-#include "LinearMath/btQuaternion.h"
-#include "LinearMath/btTransform.h"
-
-#include <sys/time.h>
-#include <iostream>
-#include "tf/time_cache.h"
-#include "tf/tf.h"
-
-using namespace std;
-
-int main(void)
-{
- btQuaternion quat;
- quat.setEuler(0,1,1);
- cout << quat.x() << std::endl << quat.y() << std::endl << quat.z() << std::endl << quat.w() << std::endl;
- quat.setEuler(0,1,0);
- cout << quat.x() << std::endl << quat.y() << std::endl << quat.z() << std::endl << quat.w() << std::endl;
- quat.setEuler(0,0,1);
- cout << quat.x() << std::endl << quat.y() << std::endl << quat.z() << std::endl << quat.w() << std::endl;
- quat.setEuler(0,1,2);
- cout << quat.x() << std::endl << quat.y() << std::endl << quat.z() << std::endl << quat.w() << std::endl;
-
-
- btTransform tran(quat, btVector3(btScalar(1), btScalar(1), btScalar(1)));
-
- std::cout << sizeof(btScalar)<<std::endl;
-
- tf::TimeCache myCache;
-
- tf::Transformer myTR;
-
-return 0;
-};
Deleted: pkg/trunk/stacks/geometery/tf/viewFrames.py
===================================================================
--- pkg/trunk/common/tf/viewFrames.py 2009-06-23 20:22:25 UTC (rev 17533)
+++ pkg/trunk/stacks/geometery/tf/viewFrames.py 2009-06-23 21:15:17 UTC (rev 17546)
@@ -1,130 +0,0 @@
-#!/usr/bin/env python
-# Software License Agreement (BSD License)
-#
-# Copyright (c) 2008, Willow Garage, Inc.
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of the Willow Garage nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Revision $Id: gossipbot.py 1013 2008-05-21 01:08:56Z sfkwc $
-
-## Simple demo of a rospy service client that calls a service to add
-## two integers.
-
-from __future__ import with_statement
-
-PKG = 'tf' # this package name
-
-import roslib; roslib.load_manifest(PKG)
-
-import sys, time
-import os
-import string
-import re
-import subprocess
-import distutils.version
-
-from optparse import OptionParser
-
-import rospy
-from tf.srv import *
-import tf
-
-def listen(duration):
- rospy.init_node("viewFrames.py", anonymous=True)
- tf_listener = tf.TransformListener()
- print "Listening to /tf_message for %f seconds"%duration
- time.sleep(duration)
- print "Done Listening"
- return tf_listener.all_frames_as_dot()
-
-
-def poll(node_name):
- print "Waiting for service %s/tf_frames"%node_name
- rospy.wait_for_service('%s/tf_frames'%node_name)
-
- try:
- print "Polling service"
- tf_frames_proxy = rospy.ServiceProxy('%s/tf_frames'%node_name, FrameGraph)
-
- output = tf_frames_proxy.call(FrameGraphRequest())
-
- except rospy.ServiceException, e:
- print "Service call failed: %s"%e
-
- return output.dot_graph
-
-def generate(dot_graph):
-
-
- with open('frames.gv', 'w') as outfile:
- outfile.write(dot_graph)
-
-
- try:
- # Check version, make postscript if too old to make pdf
- args = ["dot", "-V"]
- try:
- vstr = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[1]
- except OSError, ex:
- print "Warning: Could not execute `dot -V`. Is graphviz installed?"
- sys.exit(-1)
- v = distutils.version.StrictVersion('2.16')
- r = re.compile(".*version ([^ ]*).*")
- print vstr
- m = r.search(vstr)
- if not m or not m.group(1):
- print 'Warning: failed to determine your version of dot. Assuming v2.16'
- else:
- version = distutils.version.StrictVersion(m.group(1))
- print 'Detected dot version %s' % (version)
- if version > distutils.version.StrictVersion('2.8'):
- subprocess.check_call(["dot", "-Tpdf", "frames.gv", "-o", "frames.pdf"])
- print "frames.pdf generated"
- else:
- subprocess.check_call(["dot", "-Tps2", "frames.gv", "-o", "frames.ps"])
- print "frames.ps generated"
- except subprocess.CalledProcessError:
- print >> sys.stderr, "failed to generate frames.pdf"
-
-
-if __name__ == '__main__':
- parser = OptionParser(usage="usage: %prog [options]", prog='viewFrames.py')
- parser.add_option("--node", metavar="node name",
- type="string", help="Node to get frames from",
- dest="node")
- options, args = parser.parse_args()
-
- dot_graph = ''
- if not options.node:
- dot_graph = listen(5.0)
- else:
- print "hi", options.node
- dot_graph = poll(options.node)
-
- generate(dot_graph)
Property changes on: pkg/trunk/stacks/geometery/tf_conversions
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/util/tf_conversions:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 21:23:20
|
Revision: 17548
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17548&view=rev
Author: tfoote
Date: 2009-06-23 21:23:19 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
populating common_msgs
Added Paths:
-----------
pkg/trunk/stacks/common_msgs/diagnostic_msgs/
pkg/trunk/stacks/common_msgs/robot_msgs/
pkg/trunk/stacks/common_msgs/robot_srvs/
pkg/trunk/stacks/common_msgs/sensor_msgs/
Removed Paths:
-------------
pkg/trunk/common/diagnostic_msgs/
pkg/trunk/common/robot_msgs/
pkg/trunk/common/robot_srvs/
pkg/trunk/common/sensor_msgs/
Property changes on: pkg/trunk/stacks/common_msgs/diagnostic_msgs
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/diagnostic_msgs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/common_msgs/robot_msgs
___________________________________________________________________
Added: svn:ignore
+ .build_version
build
bin
src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/robot_msgs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/common_msgs/robot_srvs
___________________________________________________________________
Added: svn:ignore
+ src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/robot_srvs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/common_msgs/sensor_msgs
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/sensor_msgs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 21:24:32
|
Revision: 17549
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17549&view=rev
Author: tfoote
Date: 2009-06-23 21:24:26 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
moving estimation stack into new stacks directory
Added Paths:
-----------
pkg/trunk/stacks/estimation/
Removed Paths:
-------------
pkg/trunk/estimation/
Property changes on: pkg/trunk/stacks/estimation
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/estimation:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 21:32:40
|
Revision: 17550
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17550&view=rev
Author: tfoote
Date: 2009-06-23 21:32:34 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating opencv stack with latest and python
Added Paths:
-----------
pkg/trunk/stacks/opencv/
pkg/trunk/stacks/opencv/opencv_latest/
pkg/trunk/stacks/opencv/opencvpython/
Removed Paths:
-------------
pkg/trunk/3rdparty/opencv_latest/
pkg/trunk/3rdparty/opencvpython/
Property changes on: pkg/trunk/stacks/opencv/opencv_latest
___________________________________________________________________
Added: svn:ignore
+ installed
patched
rospack_nosubdirs
opencv
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/opencv_latest:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/opencv/opencvpython
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/opencvpython:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 21:39:37
|
Revision: 17552
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17552&view=rev
Author: tfoote
Date: 2009-06-23 21:39:35 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
moving visualization and visualization_core into stacks
Added Paths:
-----------
pkg/trunk/stacks/visualization/
pkg/trunk/stacks/visualization_core/
Removed Paths:
-------------
pkg/trunk/visualization/
pkg/trunk/visualization_core/
Property changes on: pkg/trunk/stacks/visualization_core
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/visualization_core:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 21:41:03
|
Revision: 17554
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17554&view=rev
Author: tfoote
Date: 2009-06-23 21:40:58 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
moving image_view into visualization stack
Added Paths:
-----------
pkg/trunk/stacks/visualization/image_view/
Removed Paths:
-------------
pkg/trunk/vision/image_view/
Property changes on: pkg/trunk/stacks/visualization/image_view
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/image_view:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:05:18
|
Revision: 17559
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17559&view=rev
Author: tfoote
Date: 2009-06-23 22:05:16 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating camera_drivers stack and populating
Added Paths:
-----------
pkg/trunk/stacks/camera_drivers/
pkg/trunk/stacks/camera_drivers/dcam/
pkg/trunk/stacks/camera_drivers/libdc1394v2/
pkg/trunk/stacks/camera_drivers/prosilica_cam/
pkg/trunk/stacks/camera_drivers/prosilica_gige_sdk/
Removed Paths:
-------------
pkg/trunk/3rdparty/libdc1394v2/
pkg/trunk/3rdparty/prosilica_gige_sdk/
pkg/trunk/drivers/cam/dcam/
pkg/trunk/drivers/cam/prosilica_cam/
Property changes on: pkg/trunk/stacks/camera_drivers/dcam
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/cam/dcam:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/camera_drivers/libdc1394v2
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/libdc1394v2:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/camera_drivers/prosilica_cam
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/cam/prosilica_cam:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/camera_drivers/prosilica_gige_sdk
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/prosilica_gige_sdk:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:15:46
|
Revision: 17563
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17563&view=rev
Author: tfoote
Date: 2009-06-23 22:15:45 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
making laser_driver stack and populating
Added Paths:
-----------
pkg/trunk/stacks/laser_drivers/
pkg/trunk/stacks/laser_drivers/hokuyo_node/
pkg/trunk/stacks/laser_drivers/sicktoolbox/
pkg/trunk/stacks/laser_drivers/sicktoolbox_wrapper/
Removed Paths:
-------------
pkg/trunk/3rdparty/sicktoolbox/
pkg/trunk/drivers/laser/hokuyo_node/
pkg/trunk/drivers/laser/sicktoolbox_wrapper/
Property changes on: pkg/trunk/stacks/laser_drivers/hokuyo_node
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/laser/hokuyo_node:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/laser_drivers/sicktoolbox
___________________________________________________________________
Added: svn:ignore
+ sicktoolbox
sicktoolbox-1.0
installed
wiped
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/sicktoolbox:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/laser_drivers/sicktoolbox_wrapper
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/laser/sicktoolbox_wrapper:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:32:58
|
Revision: 17564
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17564&view=rev
Author: tfoote
Date: 2009-06-23 22:32:56 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating imu_drivers stack and populating
Added Paths:
-----------
pkg/trunk/stacks/imu_drivers/
pkg/trunk/stacks/imu_drivers/3dmgx2_driver/
pkg/trunk/stacks/imu_drivers/imu_node/
Removed Paths:
-------------
pkg/trunk/drivers/imu/3dmgx2_driver/
pkg/trunk/drivers/imu/imu_node/
Property changes on: pkg/trunk/stacks/imu_drivers/3dmgx2_driver
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/imu/3dmgx2_driver:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/imu_drivers/imu_node
___________________________________________________________________
Added: svn:ignore
+ src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/imu/imu_node:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:39:12
|
Revision: 17568
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17568&view=rev
Author: tfoote
Date: 2009-06-23 22:39:11 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating joystick_drivers stack and populating
Added Paths:
-----------
pkg/trunk/stacks/joystick_drivers/
pkg/trunk/stacks/joystick_drivers/joy/
Removed Paths:
-------------
pkg/trunk/drivers/input/joy/
Property changes on: pkg/trunk/stacks/joystick_drivers/joy
___________________________________________________________________
Added: svn:ignore
+ joy
src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/input/joy:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:41:45
|
Revision: 17570
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17570&view=rev
Author: tfoote
Date: 2009-06-23 22:41:39 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
simulators into stacks
Added Paths:
-----------
pkg/trunk/stacks/simulators/
Removed Paths:
-------------
pkg/trunk/simulators/
Property changes on: pkg/trunk/stacks/simulators
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/simulators:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:44:34
|
Revision: 17571
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17571&view=rev
Author: tfoote
Date: 2009-06-23 22:44:33 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
moving tf_tutorials into geometery stack
Added Paths:
-----------
pkg/trunk/stacks/geometery/tf_tutorials/
Removed Paths:
-------------
pkg/trunk/common/tf_tutorials/
Property changes on: pkg/trunk/stacks/geometery/tf_tutorials
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common/tf_tutorials:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:50:57
|
Revision: 17575
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17575&view=rev
Author: tfoote
Date: 2009-06-23 22:50:56 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating trex stack and populating
Added Paths:
-----------
pkg/trunk/stacks/trex/
pkg/trunk/stacks/trex/executive_trex_pr2/
pkg/trunk/stacks/trex/trex/
Removed Paths:
-------------
pkg/trunk/3rdparty/trex/
pkg/trunk/highlevel/executive_trex/executive_trex_pr2/
Property changes on: pkg/trunk/stacks/trex/executive_trex_pr2
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/highlevel/executive_trex/executive_trex_pr2:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/trex/trex
___________________________________________________________________
Added: svn:ignore
+ PlanWorks
TREX
include
logs
PLASMA
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/trex:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 22:57:04
|
Revision: 17576
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17576&view=rev
Author: tfoote
Date: 2009-06-23 22:57:03 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating visual_feature_detectors stack and populating
Added Paths:
-----------
pkg/trunk/stacks/visual_feature_detectors/
pkg/trunk/stacks/visual_feature_detectors/calonder_descriptor/
pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector/
pkg/trunk/stacks/visual_feature_detectors/fast_detector/
pkg/trunk/stacks/visual_feature_detectors/outlet_detection/
pkg/trunk/stacks/visual_feature_detectors/star_detector/
Removed Paths:
-------------
pkg/trunk/3rdparty/fast_detector/
pkg/trunk/vision/calonder_descriptor/
pkg/trunk/vision/checkerboard_detector/
pkg/trunk/vision/outlet_detection/
pkg/trunk/vision/star_detector/
Property changes on: pkg/trunk/stacks/visual_feature_detectors/calonder_descriptor
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/calonder_descriptor:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/visual_feature_detectors/checkerboard_detector
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/checkerboard_detector:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/visual_feature_detectors/fast_detector
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/fast_detector:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/visual_feature_detectors/outlet_detection
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/outlet_detection:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/visual_feature_detectors/star_detector
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/star_detector:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 23:15:25
|
Revision: 17579
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17579&view=rev
Author: tfoote
Date: 2009-06-23 23:15:15 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
moving hardware_test into stack
Added Paths:
-----------
pkg/trunk/stacks/hardware_test/
Removed Paths:
-------------
pkg/trunk/hardware_test/
Property changes on: pkg/trunk/stacks/hardware_test
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/hardware_test:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 23:16:59
|
Revision: 17581
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17581&view=rev
Author: tfoote
Date: 2009-06-23 23:16:57 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating stereo stack and populating
Added Paths:
-----------
pkg/trunk/stacks/stereo/
pkg/trunk/stacks/stereo/stereo_image_proc/
pkg/trunk/stacks/stereo/stereo_utils/
pkg/trunk/stacks/stereo/vop/
Removed Paths:
-------------
pkg/trunk/3rdparty/vop/
pkg/trunk/vision/stereo_image_proc/
pkg/trunk/vision/stereo_utils/
Property changes on: pkg/trunk/stacks/stereo/stereo_image_proc
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/stereo_image_proc:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/stereo/stereo_utils
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/vision/stereo_utils:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/stereo/vop
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/vop:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-23 23:43:37
|
Revision: 17583
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17583&view=rev
Author: tfoote
Date: 2009-06-23 23:43:34 +0000 (Tue, 23 Jun 2009)
Log Message:
-----------
creating pr2 pr2_driver and map_building stacks and populating
Added Paths:
-----------
pkg/trunk/stacks/map_building/
pkg/trunk/stacks/map_building/gmapping/
pkg/trunk/stacks/map_building/slam_gmapping/
pkg/trunk/stacks/pr2/
pkg/trunk/stacks/pr2/pr2_alpha/
pkg/trunk/stacks/pr2/pr2_default_controllers/
pkg/trunk/stacks/pr2/pr2_defs/
pkg/trunk/stacks/pr2/pr2_etherCAT/
pkg/trunk/stacks/pr2/pr2_robot_actions/
pkg/trunk/stacks/pr2_drivers/
pkg/trunk/stacks/pr2_drivers/eml/
pkg/trunk/stacks/pr2_drivers/ethercat_hardware/
pkg/trunk/stacks/pr2_drivers/ocean_battery_driver/
pkg/trunk/stacks/pr2_drivers/point_cloud_assembler/
pkg/trunk/stacks/pr2_drivers/pr2_msgs/
pkg/trunk/stacks/pr2_drivers/pr2_power_board/
pkg/trunk/stacks/pr2_drivers/pr2_srvs/
Removed Paths:
-------------
pkg/trunk/3rdparty/eml/
pkg/trunk/3rdparty/gmapping/
pkg/trunk/drivers/motor/ethercat_hardware/
pkg/trunk/drivers/robot/pr2/ocean_battery_driver/
pkg/trunk/drivers/robot/pr2/point_cloud_assembler/
pkg/trunk/drivers/robot/pr2/pr2_power_board/
pkg/trunk/highlevel/pr2_robot_actions/
pkg/trunk/nav/slam_gmapping/
pkg/trunk/pr2/pr2_etherCAT/
pkg/trunk/pr2/pr2_msgs/
pkg/trunk/pr2/pr2_srvs/
pkg/trunk/robot_descriptions/pr2/pr2_configurations/pr2_alpha/
pkg/trunk/robot_descriptions/pr2/pr2_default_controllers/
pkg/trunk/robot_descriptions/pr2/pr2_defs/
Property changes on: pkg/trunk/stacks/map_building/gmapping
___________________________________________________________________
Added: svn:ignore
+ installed
include
wiped
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/gmapping:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/map_building/slam_gmapping
___________________________________________________________________
Added: svn:ignore
+ slam_gmapping
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/nav/slam_gmapping:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2/pr2_alpha
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/pr2/pr2_configurations/pr2_alpha:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Added: svk:merge
+ 637b03a7-42c1-4bbd-8d43-e365e379942c:/prfilters/robot_descriptions/pr2_alpha:12653
Property changes on: pkg/trunk/stacks/pr2/pr2_default_controllers
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/pr2/pr2_default_controllers:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2/pr2_defs
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/robot_descriptions/pr2/pr2_defs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2/pr2_etherCAT
___________________________________________________________________
Added: svn:ignore
+ pr2_etherCAT
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/pr2/pr2_etherCAT:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2/pr2_robot_actions
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/highlevel/pr2_robot_actions:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/eml
___________________________________________________________________
Added: svn:ignore
+ eml
wiped
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/eml:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/ethercat_hardware
___________________________________________________________________
Added: svn:ignore
+ motorconf
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/motor/ethercat_hardware:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/ocean_battery_driver
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/robot/pr2/ocean_battery_driver:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/point_cloud_assembler
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/robot/pr2/point_cloud_assembler:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/pr2_msgs
___________________________________________________________________
Added: svn:ignore
+ src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/pr2/pr2_msgs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/pr2_power_board
___________________________________________________________________
Added: svn:ignore
+ power
power_node
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/drivers/robot/pr2/pr2_power_board:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/pr2_drivers/pr2_srvs
___________________________________________________________________
Added: svn:ignore
+ src
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/pr2/pr2_srvs:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-24 02:19:18
|
Revision: 17590
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17590&view=rev
Author: tfoote
Date: 2009-06-24 01:53:08 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
moving common into stacks
Added Paths:
-----------
pkg/trunk/stacks/common/
Removed Paths:
-------------
pkg/trunk/common/
Property changes on: pkg/trunk/stacks/common
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/common:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-24 02:19:21
|
Revision: 17592
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17592&view=rev
Author: tfoote
Date: 2009-06-24 02:19:11 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
creating world_models stack
Added Paths:
-----------
pkg/trunk/stacks/world_models/
pkg/trunk/stacks/world_models/costmap_2d/
pkg/trunk/stacks/world_models/stack.xml
pkg/trunk/stacks/world_models/topological_map/
pkg/trunk/stacks/world_models/voxel_grid/
Removed Paths:
-------------
pkg/trunk/world_models/costmap_2d/
pkg/trunk/world_models/stack.xml
pkg/trunk/world_models/topological_map/
pkg/trunk/world_models/voxel_grid/
Property changes on: pkg/trunk/stacks/world_models/costmap_2d
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/world_models/costmap_2d:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/stacks/world_models/stack.xml (from rev 17583, pkg/trunk/world_models/stack.xml)
===================================================================
--- pkg/trunk/stacks/world_models/stack.xml (rev 0)
+++ pkg/trunk/stacks/world_models/stack.xml 2009-06-24 02:19:11 UTC (rev 17592)
@@ -0,0 +1,15 @@
+<stack name="world_models" version="0.1">
+ <description brief="world models">
+ Packages for modeling states of the world.
+ </description>
+ <version>0.1</version>
+ <author>Eitan ei...@wi...</author>
+ <license>BSD</license>
+ <review status="unreviewed" notes=""/>
+ <url>http://pr.willowgarage.com/wiki/world_models</url>
+
+ <depend stack="ros" version="0.5"/>
+ <depend stack="ros-pkg_common" version="0.1"/>
+ <depend stack="ros-pkg_visualization_core" version="0.1"/>
+</stack>
+
Property changes on: pkg/trunk/stacks/world_models/stack.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/world_models/stack.xml:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/world_models/voxel_grid
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/world_models/voxel_grid:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Deleted: pkg/trunk/world_models/stack.xml
===================================================================
--- pkg/trunk/world_models/stack.xml 2009-06-24 02:10:29 UTC (rev 17591)
+++ pkg/trunk/world_models/stack.xml 2009-06-24 02:19:11 UTC (rev 17592)
@@ -1,15 +0,0 @@
-<stack name="world_models" version="0.1">
- <description brief="world models">
- Packages for modeling states of the world.
- </description>
- <version>0.1</version>
- <author>Eitan ei...@wi...</author>
- <license>BSD</license>
- <review status="unreviewed" notes=""/>
- <url>http://pr.willowgarage.com/wiki/world_models</url>
-
- <depend stack="ros" version="0.5"/>
- <depend stack="ros-pkg_common" version="0.1"/>
- <depend stack="ros-pkg_visualization_core" version="0.1"/>
-</stack>
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-24 02:22:42
|
Revision: 17593
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17593&view=rev
Author: tfoote
Date: 2009-06-24 02:22:35 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
creating semantic_mapping stack
Added Paths:
-----------
pkg/trunk/stacks/semantic_mapping/
pkg/trunk/stacks/semantic_mapping/ANN/
pkg/trunk/stacks/semantic_mapping/FLANN/
pkg/trunk/stacks/semantic_mapping/cminpack/
pkg/trunk/stacks/semantic_mapping/door_handle_detector/
pkg/trunk/stacks/semantic_mapping/plug_onbase_detector/
pkg/trunk/stacks/semantic_mapping/point_cloud_mapping/
pkg/trunk/stacks/semantic_mapping/semantic_point_annotator/
pkg/trunk/stacks/semantic_mapping/stack.xml
Removed Paths:
-------------
pkg/trunk/3rdparty/ANN/
pkg/trunk/3rdparty/FLANN/
pkg/trunk/3rdparty/cminpack/
pkg/trunk/mapping/door_handle_detector/
pkg/trunk/mapping/plug_onbase_detector/
pkg/trunk/mapping/point_cloud_mapping/
pkg/trunk/mapping/semantic_point_annotator/
pkg/trunk/mapping/stack.xml
Deleted: pkg/trunk/mapping/stack.xml
===================================================================
--- pkg/trunk/mapping/stack.xml 2009-06-24 02:19:11 UTC (rev 17592)
+++ pkg/trunk/mapping/stack.xml 2009-06-24 02:22:35 UTC (rev 17593)
@@ -1,15 +0,0 @@
-<stack name="mapping" version="0.1">
- <description brief="laser-based sensing packages from ros-pkg">
- These are packages that primarily process laser / range data.
- </description>
- <version>0.1</version>
- <author>Radu Rusu ru...@wi...,
- Marius Muja ma...@wi...
- </author>
- <license>BSD</license>
- <review status="unreviewed" notes=""/>
- <url>http://pr.willowgarage.com/wiki/mapping</url>
-
- <depend stack="ros" version="0.5"/>
-</stack>
-
Property changes on: pkg/trunk/stacks/semantic_mapping/ANN
___________________________________________________________________
Added: svn:ignore
+ installed
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/ANN:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/FLANN
___________________________________________________________________
Added: svn:ignore
+ installed
wiped
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/FLANN:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/cminpack
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/cminpack:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/door_handle_detector
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mapping/door_handle_detector:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/plug_onbase_detector
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mapping/plug_onbase_detector:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/point_cloud_mapping
___________________________________________________________________
Added: svn:ignore
+ .build_version
.rosgcov_files
build
lib
bin
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mapping/point_cloud_mapping:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/semantic_mapping/semantic_point_annotator
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mapping/semantic_point_annotator:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/stacks/semantic_mapping/stack.xml (from rev 17591, pkg/trunk/mapping/stack.xml)
===================================================================
--- pkg/trunk/stacks/semantic_mapping/stack.xml (rev 0)
+++ pkg/trunk/stacks/semantic_mapping/stack.xml 2009-06-24 02:22:35 UTC (rev 17593)
@@ -0,0 +1,15 @@
+<stack name="mapping" version="0.1">
+ <description brief="laser-based sensing packages from ros-pkg">
+ These are packages that primarily process laser / range data.
+ </description>
+ <version>0.1</version>
+ <author>Radu Rusu ru...@wi...,
+ Marius Muja ma...@wi...
+ </author>
+ <license>BSD</license>
+ <review status="unreviewed" notes=""/>
+ <url>http://pr.willowgarage.com/wiki/mapping</url>
+
+ <depend stack="ros" version="0.5"/>
+</stack>
+
Property changes on: pkg/trunk/stacks/semantic_mapping/stack.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mapping/stack.xml:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tf...@us...> - 2009-06-24 02:27:15
|
Revision: 17594
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17594&view=rev
Author: tfoote
Date: 2009-06-24 02:27:11 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
creating mechanism stack and populating
Added Paths:
-----------
pkg/trunk/stacks/mechanism/
pkg/trunk/stacks/mechanism/convex_decomposition/
pkg/trunk/stacks/mechanism/ivcon/
pkg/trunk/stacks/mechanism/kdl_parser/
pkg/trunk/stacks/mechanism/robot_state_publisher/
Removed Paths:
-------------
pkg/trunk/3rdparty/convex_decomposition/
pkg/trunk/3rdparty/ivcon/
pkg/trunk/mechanism/
pkg/trunk/sandbox/kdl_parser/
pkg/trunk/sandbox/robot_state_publisher/
Property changes on: pkg/trunk/stacks/mechanism
___________________________________________________________________
Added: svn:ignore
+
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/mechanism:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/mechanism/convex_decomposition
___________________________________________________________________
Added: svn:ignore
+ installed
wiped
convex_decomposition
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/convex_decomposition:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/mechanism/ivcon
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/3rdparty/ivcon:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/mechanism/kdl_parser
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/kdl_parser:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Property changes on: pkg/trunk/stacks/mechanism/robot_state_publisher
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/sandbox/robot_state_publisher:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <hsu...@us...> - 2009-06-24 19:19:23
|
Revision: 17603
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17603&view=rev
Author: hsujohnhsu
Date: 2009-06-24 19:19:18 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
update to gazebo svn revision 7888
gazebo plugins now using node handles api
Revision Links:
--------------
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=7888&view=rev
Modified Paths:
--------------
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_battery.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_block_laser.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_bumper.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_camera.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_f3d.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_laser.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_p3d.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_ptz.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_sim_iface.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h
pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h
pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_battery.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_f3d.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_p3d.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_prosilica.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_ptz.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_sim_iface.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_stereo_camera.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_time.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/urdf2factory.cpp
pkg/trunk/drivers/simulator/gazebo_plugin/src/xml2factory.cpp
pkg/trunk/stacks/simulators/gazebo/Makefile
Added Paths:
-----------
pkg/trunk/stacks/simulators/gazebo/gazebo_new_patch.diff
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_battery.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_battery.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_battery.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -39,7 +39,7 @@
#include <diagnostic_msgs/DiagnosticMessage.h>
#include <diagnostic_msgs/DiagnosticStatus.h>
#include <gazebo_plugin/PlugCommand.h>
-#include <ros/node.h>
+#include <ros/ros.h>
#include <boost/thread/mutex.hpp>
namespace gazebo
@@ -115,7 +115,9 @@
diagnostic_msgs::DiagnosticStatus diagnostic_status_;
/// \brief pointer to ros node
- private: ros::Node *rosnode_;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
+ private: ros::Subscriber sub_;
/// \brief battery state topic name
private: std::string stateTopicName_;
@@ -155,8 +157,7 @@
private: double default_consumption_rate_;
/// \brief listen to ROS to see if we are charging
- private: void SetPlug();
- private: gazebo_plugin::PlugCommand plug_msg_;
+ private: void SetPlug(const gazebo_plugin::PlugCommandConstPtr& plug_msg);
};
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/gazebo_mechanism_control.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -157,7 +157,7 @@
/*
* \brief pointer to ros node
*/
- ros::Node *rosnode_;
+ ros::NodeHandle* rosnode_;
/*
* \brief tmp vars for performance checking
@@ -165,8 +165,8 @@
double wall_start, sim_start;
/// \brief set topic name of robotdesc parameter
- private: ParamT<std::string> *robotParamP;
- private: std::string robotParam;
+ ParamT<std::string> *robotParamP;
+ std::string robotParam;
};
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_block_laser.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_block_laser.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_block_laser.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -30,7 +30,7 @@
#include <gazebo/Controller.hh>
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <robot_msgs/PointCloud.h>
@@ -159,7 +159,8 @@
private: RaySensor *myParent;
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ros message
private: robot_msgs::PointCloud cloudMsg;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_bumper.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_bumper.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_bumper.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -33,7 +33,7 @@
#include <gazebo/Param.hh>
// ros messages
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <std_msgs/String.h>
#include <robot_msgs/Vector3Stamped.h>
@@ -96,7 +96,8 @@
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher info_pub_,force_pub_;
/// \brief set topic name of broadcast
private: ParamT<std::string> *bumperTopicNameP;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_camera.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_camera.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_camera.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -27,7 +27,7 @@
#ifndef ROS_CAMERA_HH
#define ROS_CAMERA_HH
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <image_msgs/Image.h>
#include <gazebo/Param.hh>
@@ -118,7 +118,8 @@
private: MonoCameraSensor *myParent;
/// \brief A pointer to the ROS node. A node will be instantiated if it does not exist.
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ROS image message
private: image_msgs::Image imageMsg;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_f3d.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_f3d.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_f3d.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -32,7 +32,7 @@
#include <gazebo/Model.hh>
#include <gazebo/Body.hh>
-#include <ros/node.h>
+#include <ros/ros.h>
#include <boost/thread/mutex.hpp>
#include <robot_msgs/Vector3Stamped.h>
@@ -95,7 +95,8 @@
/// \brief A pointer to the ROS node. A node will be instantiated if it does not exist.
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ROS Vector3Stamped message
private: robot_msgs::Vector3Stamped vector3Msg;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_laser.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_laser.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_laser.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -30,7 +30,7 @@
#include <gazebo/Controller.hh>
-#include <ros/node.h>
+#include <ros/ros.h>
#include <boost/thread/mutex.hpp>
#include <laser_scan/LaserScan.h>
@@ -141,7 +141,8 @@
private: RaySensor *myParent;
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ros message
private: laser_scan::LaserScan laserMsg;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_p3d.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_p3d.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_p3d.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -32,7 +32,7 @@
#include <gazebo/Model.hh>
#include <gazebo/Body.hh>
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <robot_msgs/PoseWithRatesStamped.h>
@@ -118,7 +118,8 @@
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ros message
private: robot_msgs::PoseWithRatesStamped poseMsg;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_prosilica.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -27,7 +27,7 @@
#ifndef ROS_CAMERA_HH
#define ROS_CAMERA_HH
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <gazebo/Param.hh>
#include <gazebo/Controller.hh>
@@ -137,7 +137,9 @@
private: MonoCameraSensor *myParent;
/// \brief A pointer to the ROS node. A node will be instantiated if it does not exist.
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher image_pub_,image_rect_pub_,cam_info_pub_;
+ private: ros::ServiceServer cam_info_ser_,poll_ser_;
/// \brief ros message
/// \brief construct raw stereo message
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_ptz.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_ptz.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_ptz.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -33,7 +33,7 @@
#include <gazebo/Model.hh>
// ros messages
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
// messages for controlling ptz
@@ -146,13 +146,15 @@
private: ParamT<std::string> *stateTopicNameP;
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
+ private: ros::Subscriber sub_;
+
/// \brief ros message
private: axis_cam::PTZActuatorState PTZStateMessage;
- private: axis_cam::PTZActuatorCmd PTZControlMessage;
/// \brief receive message
- private: void PTZCommandReceived();
+ private: void PTZCommandReceived(const axis_cam::PTZActuatorCmdConstPtr& in);
/// \brief topic name
private: std::string commandTopicName;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_sim_iface.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_sim_iface.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_sim_iface.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -27,7 +27,7 @@
#ifndef ROS_SIM_IFACE_HH
#define ROS_SIM_IFACE_HH
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <gazebo/Controller.hh>
#include <gazebo/Param.hh>
@@ -91,17 +91,15 @@
protected: virtual void FiniChild();
/// \brief call back when a PoseWithRatesStamped message is published
- private: void UpdateObjectPose();
+ private: void UpdateObjectPose(const robot_msgs::PoseWithRatesStampedConstPtr& poseMsg);
/// \brief A pointer to the parent entity
private: Entity *myParent;
/// \brief A pointer to the ROS node. A node will be instantiated if it does not exist.
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Subscriber sub_;
- /// \brief ROS PoseWithRatesStamped message
- private: robot_msgs::PoseWithRatesStamped poseMsg;
-
/// \brief A mutex to lock access to fields that are used in ROS message callbacks
private: boost::mutex lock;
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_stereo_camera.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -28,7 +28,7 @@
#ifndef ROS_STEREO_CAMERA_HH
#define ROS_STEREO_CAMERA_HH
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
#include <gazebo/Generic_Camera.hh>
@@ -159,7 +159,8 @@
private: double baseline;
/// \brief pointer to ros node
- private: ros::Node *rosnode;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
/// \brief ros message
/// \brief construct raw stereo message
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/include/gazebo_plugin/ros_time.h 2009-06-24 19:19:18 UTC (rev 17603)
@@ -31,7 +31,7 @@
#include <gazebo/Body.hh>
#include <gazebo/World.hh>
-#include <ros/node.h>
+#include <ros/ros.h>
#include "boost/thread/mutex.hpp"
// roscpp - used for broadcasting time over ros
@@ -121,8 +121,11 @@
/// \brief A mutex to lock access to fields that are used in message callbacks
private: boost::mutex lock;
+
/// \brief pointer to ros node
- ros::Node *rosnode_;
+ private: ros::NodeHandle* rosnode_;
+ private: ros::Publisher pub_;
+
roslib::Time timeMsg;
};
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_battery.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_battery.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_battery.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -55,31 +55,26 @@
if (!this->parent_model_)
gzthrow("GazeboBattery controller requires a Model as its parent");
- rosnode_ = ros::g_node; // comes from where?
- int argc = 0;
- char** argv = NULL;
- if (rosnode_ == NULL)
- {
- // this only works for a single camera.
- ros::init(argc,argv);
- rosnode_ = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in P3D");
- }
+ int argc = 0;
+ char** argv = NULL;
+ ros::init(argc,argv,"gazebo_battery");
+ this->rosnode_ = new ros::NodeHandle();
}
GazeboBattery::~GazeboBattery()
{
+ delete this->rosnode_;
}
void GazeboBattery::LoadChild(XMLConfigNode *node)
{
this->stateTopicName_ = node->GetString("stateTopicName","battery_state",0);
- rosnode_->advertise<robot_msgs::BatteryState>(this->stateTopicName_,10);
+ this->pub_ = this->rosnode_->advertise<robot_msgs::BatteryState>(this->stateTopicName_,10);
//this->diagnosticMessageTopicName_ = node->GetString("diagnosticMessageTopicName","diagnostic",0);
- //rosnode_->advertise<diagnostic_msgs::DiagnosticMessage>(this->diagnosticMessageTopicName_,10);
+ //this->diag_pub_ = this->rosnode_->advertise<diagnostic_msgs::DiagnosticMessage>(this->diagnosticMessageTopicName_,10);
/// faking the plug and unplug of robot
- rosnode_->subscribe("plugged_in",this->plug_msg_,&GazeboBattery::SetPlug,this,10);
+ this->sub_ = this->rosnode_->subscribe("plugged_in",10,&GazeboBattery::SetPlug,this);
this->default_consumption_rate_ = node->GetDouble("default_consumption_rate",-10.0,0);
this->full_capacity_ = node->GetDouble("full_charge_energy",0.0,0);
@@ -91,10 +86,10 @@
this->battery_state_rate_ = node->GetDouble("dbattery_state_rate_",1.0,0);
}
- void GazeboBattery::SetPlug()
+ void GazeboBattery::SetPlug(const gazebo_plugin::PlugCommandConstPtr& plug_msg)
{
this->lock_.lock();
- if (this->plug_msg_.status == "the robot is very much plugged into the wall")
+ if (plug_msg->status == "the robot is very much plugged into the wall")
this->consumption_rate_ = this->default_charge_rate_ + this->default_consumption_rate_;
else
this->consumption_rate_ = this->default_consumption_rate_;
@@ -138,7 +133,7 @@
this->battery_state_.power_consumption = this->consumption_rate_;
this->lock_.lock();
- this->rosnode_->publish(this->stateTopicName_,this->battery_state_);
+ this->pub_.publish(this->battery_state_);
this->lock_.unlock();
/**********************************************************/
@@ -153,7 +148,7 @@
//this->diagnostic_message_.set_status_size(1);
//this->diagnostic_message_.status[0] = this->diagnostic_status_;
//this->lock_.lock();
- //this->rosnode_->publish(this->diagnosticMessageTopicName_,diagnostic_message_);
+ //this->diag_pub_.publish(this->diagnosticMessageTopicName_,diagnostic_message_);
//this->lock_.unlock();
this->last_time_ = this->current_time_;
@@ -162,11 +157,6 @@
void GazeboBattery::FiniChild()
{
ROS_DEBUG("Calling FiniChild in GazeboBattery");
-
- rosnode_->unadvertise(this->stateTopicName_);
- //rosnode_->unadvertise(this->diagnosticMessageTopicName_);
- rosnode_->unsubscribe("plugged_in");
-
}
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/gazebo_mechanism_control.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -61,28 +61,22 @@
this->robotParamP = new ParamT<std::string>("robotParam", "robotdesc/pr2", 0);
Param::End();
- rosnode_ = ros::g_node; // comes from where?
- int argc = 0;
- char** argv = NULL;
- if (rosnode_ == NULL)
- {
- // this only works for a single camera.
- ros::init(argc,argv);
- rosnode_ = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in Gazebo Mechanism Control");
- }
-
if (getenv("CHECK_SPEEDUP"))
{
wall_start = Simulator::Instance()->GetWallTime();
sim_start = Simulator::Instance()->GetSimTime();
}
+ int argc = 0;
+ char** argv = NULL;
+ ros::init(argc,argv,"gazebo_mechanism_control");
+ this->rosnode_ = new ros::NodeHandle();
}
GazeboMechanismControl::~GazeboMechanismControl()
{
delete this->robotParamP;
+ delete this->rosnode_;
}
void GazeboMechanismControl::LoadChild(XMLConfigNode *node)
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_block_laser.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -57,23 +57,17 @@
// set parent sensor to active automatically
this->myParent->SetActive(true);
-
- rosnode = ros::g_node; // comes from where? common.h exports as global variable
int argc = 0;
char** argv = NULL;
- if (rosnode == NULL)
- {
- // start a ros node if none exist
- ros::init(argc,argv);
- rosnode = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in laser");
- }
+ ros::init(argc,argv,"ros_block_laser");
+ this->rosnode_ = new ros::NodeHandle();
}
////////////////////////////////////////////////////////////////////////////////
// Destructor
RosBlockLaser::~RosBlockLaser()
{
+ delete this->rosnode_;
}
////////////////////////////////////////////////////////////////////////////////
@@ -82,7 +76,7 @@
{
this->topicName = node->GetString("topicName","default_ros_laser",0); //read from xml file
ROS_DEBUG("================= %s", this->topicName.c_str());
- rosnode->advertise<robot_msgs::PointCloud>(this->topicName,10);
+ this->pub_ = this->rosnode_->advertise<robot_msgs::PointCloud>(this->topicName,10);
this->frameName = node->GetString("frameName","default_ros_laser",0); //read from xml file
this->gaussianNoise = node->GetDouble("gaussianNoise",0.0,0); //read from xml file
@@ -120,7 +114,6 @@
// Finalize the controller
void RosBlockLaser::FiniChild()
{
- rosnode->unadvertise(this->topicName);
}
////////////////////////////////////////////////////////////////////////////////
@@ -244,7 +237,7 @@
}
// send data out via ros message
- rosnode->publish(this->topicName,this->cloudMsg);
+ this->pub_.publish(this->cloudMsg);
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_bumper.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -35,6 +35,7 @@
#include <gazebo/ControllerFactory.hh>
#include <gazebo/Simulator.hh>
#include <gazebo/Body.hh>
+#include <gazebo/Body.hh>
using namespace gazebo;
@@ -54,17 +55,10 @@
this->bumperTopicNameP = new ParamT<std::string>("bumperTopicName", "bumper", 0);
Param::End();
- rosnode = ros::g_node; // comes from where?
int argc = 0;
char** argv = NULL;
- if (rosnode == NULL)
- {
- // this only works for a single camera.
- ros::init(argc,argv);
- rosnode = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_INFO("Starting node in bumper");
- }
-
+ ros::init(argc,argv,"ros_bumper");
+ this->rosnode_ = new ros::NodeHandle();
}
////////////////////////////////////////////////////////////////////////////////
@@ -72,6 +66,7 @@
RosBumper::~RosBumper()
{
delete this->bumperTopicNameP;
+ delete this->rosnode_;
}
////////////////////////////////////////////////////////////////////////////////
@@ -84,8 +79,8 @@
this->bumperTopicName.c_str());
//std::cout << " publishing contact/collisions to topic name: " << this->bumperTopicName << std::endl;
- rosnode->advertise<std_msgs::String>(this->bumperTopicName+std::string("/info"),100);
- rosnode->advertise<robot_msgs::Vector3Stamped>(this->bumperTopicName+std::string("/force"),100);
+ this->info_pub_ = this->rosnode_->advertise<std_msgs::String>(this->bumperTopicName+std::string("/info"),100);
+ this->force_pub_ = this->rosnode_->advertise<robot_msgs::Vector3Stamped>(this->bumperTopicName+std::string("/force"),100);
}
////////////////////////////////////////////////////////////////////////////////
@@ -145,8 +140,8 @@
this->forceMsg.vector.y = (1.0-eps)*this->forceMsg.vector.y + eps*contact_forces.f1[1];
this->forceMsg.vector.z = (1.0-eps)*this->forceMsg.vector.z + eps*contact_forces.f1[2];
- rosnode->publish(this->bumperTopicName+std::string("/info"),this->bumperMsg);
- rosnode->publish(this->bumperTopicName+std::string("/force"),this->forceMsg);
+ this->info_pub_.publish(this->bumperMsg);
+ this->force_pub_.publish(this->forceMsg);
}
}
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_camera.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -65,22 +65,17 @@
this->frameNameP = new ParamT<std::string>("frameName","stereo_link", 0);
Param::End();
- rosnode = ros::g_node; //@todo: change to handles
int argc = 0;
char** argv = NULL;
- if (rosnode == NULL)
- {
- ros::init(argc,argv);
- rosnode = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in camera");
- }
-
+ ros::init(argc,argv,"ros_camera");
+ this->rosnode_ = new ros::NodeHandle();
}
////////////////////////////////////////////////////////////////////////////////
// Destructor
RosCamera::~RosCamera()
{
+ delete this->rosnode_;
delete this->topicNameP;
delete this->frameNameP;
}
@@ -95,7 +90,7 @@
this->frameName = this->frameNameP->GetValue();
ROS_DEBUG("================= %s", this->topicName.c_str());
- rosnode->advertise<image_msgs::Image>(this->topicName,1);
+ this->pub_ = this->rosnode_->advertise<image_msgs::Image>(this->topicName,1);
}
////////////////////////////////////////////////////////////////////////////////
@@ -140,7 +135,6 @@
// Finalize the controller
void RosCamera::FiniChild()
{
- rosnode->unadvertise(this->topicName);
this->myParent->SetActive(false);
}
@@ -171,7 +165,7 @@
//double tmpT2;
/// @todo: don't bother if there are no subscribers
- if (this->rosnode->numSubscribers(this->topicName) > 0)
+ if (this->pub_.getNumSubscribers() > 0)
{
// copy from src to imageMsg
fillImage(this->imageMsg ,"image_raw" ,
@@ -182,7 +176,7 @@
//tmpT2 = Simulator::Instance()->GetWallTime();
// publish to ros
- rosnode->publish(this->topicName,this->imageMsg);
+ this->pub_.publish(this->imageMsg);
}
//double tmpT3 = Simulator::Instance()->GetWallTime();
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_f3d.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_f3d.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_f3d.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -49,27 +49,22 @@
RosF3D::RosF3D(Entity *parent )
: Controller(parent)
{
- this->myParent = dynamic_cast<Model*>(this->parent);
+ this->myParent = dynamic_cast<Model*>(this->parent);
- if (!this->myParent)
- gzthrow("RosF3D controller requires a Model as its parent");
+ if (!this->myParent)
+ gzthrow("RosF3D controller requires a Model as its parent");
- rosnode = ros::g_node; // comes from where?
int argc = 0;
char** argv = NULL;
- if (rosnode == NULL)
- {
- // this only works for a single camera.
- ros::init(argc,argv);
- rosnode = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in RosF3D");
- }
+ ros::init(argc,argv,"ros_f3d");
+ this->rosnode_ = new ros::NodeHandle();
}
////////////////////////////////////////////////////////////////////////////////
// Destructor
RosF3D::~RosF3D()
{
+ delete this->rosnode_;
}
////////////////////////////////////////////////////////////////////////////////
@@ -84,7 +79,7 @@
this->frameName = node->GetString("frameName", "", 1);
ROS_DEBUG("==== topic name for RosF3D ======== %s", this->topicName.c_str());
- rosnode->advertise<robot_msgs::Vector3Stamped>(this->topicName,10);
+ this->pub_ = this->rosnode_->advertise<robot_msgs::Vector3Stamped>(this->topicName,10);
}
////////////////////////////////////////////////////////////////////////////////
@@ -122,7 +117,7 @@
// << " f: " << force
// << " t: " << torque << std::endl;
// publish to ros
- rosnode->publish(this->topicName,this->vector3Msg);
+ this->pub_.publish(this->vector3Msg);
this->lock.unlock();
}
@@ -131,5 +126,4 @@
// Finalize the controller
void RosF3D::FiniChild()
{
- rosnode->unadvertise(this->topicName);
}
Modified: pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp
===================================================================
--- pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp 2009-06-24 18:00:57 UTC (rev 17602)
+++ pkg/trunk/drivers/simulator/gazebo_plugin/src/ros_laser.cpp 2009-06-24 19:19:18 UTC (rev 17603)
@@ -58,25 +58,21 @@
// set parent sensor to active automatically
this->myParent->SetActive(true);
- rosnode = ros::g_node; // comes from where? common.h exports as global variable
- int argc = 0;
- char** argv = NULL;
- if (rosnode == NULL)
- {
- // start a ros node if none exist
- ros::init(argc,argv);
- rosnode = new ros::Node("ros_gazebo",ros::Node::DONT_HANDLE_SIGINT);
- ROS_DEBUG("Starting node in laser");
- }
this->hokuyo_min_intensity = 101.0;
ROS_WARN("WARNING: ros_laser plugin artifically sets minimum intensity to %f due to cutoff in hokuyo filters."
, this->hokuyo_min_intensity);
+
+ int argc = 0;
+ char** argv = NULL;
+ ros::init(argc,argv,"ros_laser");
+ this->rosnode_ = new ros::NodeHandle();
}
/////////////////////////////////////////////////////////////////////////////...
[truncated message content] |
|
From: <tf...@us...> - 2009-06-24 20:25:55
|
Revision: 17610
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17610&view=rev
Author: tfoote
Date: 2009-06-24 20:24:46 +0000 (Wed, 24 Jun 2009)
Log Message:
-----------
creating motion planning stack
Added Paths:
-----------
pkg/trunk/stacks/motion_planning/
pkg/trunk/stacks/motion_planning/sbpl/
pkg/trunk/stacks/motion_planning/stack.xml
Removed Paths:
-------------
pkg/trunk/motion_planning/sbpl/
pkg/trunk/motion_planning/stack.xml
Deleted: pkg/trunk/motion_planning/stack.xml
===================================================================
--- pkg/trunk/motion_planning/stack.xml 2009-06-24 20:24:13 UTC (rev 17609)
+++ pkg/trunk/motion_planning/stack.xml 2009-06-24 20:24:46 UTC (rev 17610)
@@ -1,14 +0,0 @@
-<stack name="motion_planning" version="0.1">
- <description brief="motion plannig packages from ros-pkg">
- This stack contains motion planners and supporting infrastructure.
- </description>
- <version>0.1</version>
- <author>Sachin Chitta sa...@wi...</author>
- <license>BSD</license>
- <review status="unreviewed" notes=""/>
- <url>http://pr.willowgarage.com/wiki/motion_planning</url>
-
- <depend stack="ros" version="0.5"/>
-</stack>
-
-
Property changes on: pkg/trunk/stacks/motion_planning/sbpl
___________________________________________________________________
Added: svn:ignore
+ bin
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/motion_planning/sbpl:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
Copied: pkg/trunk/stacks/motion_planning/stack.xml (from rev 17591, pkg/trunk/motion_planning/stack.xml)
===================================================================
--- pkg/trunk/stacks/motion_planning/stack.xml (rev 0)
+++ pkg/trunk/stacks/motion_planning/stack.xml 2009-06-24 20:24:46 UTC (rev 17610)
@@ -0,0 +1,14 @@
+<stack name="motion_planning" version="0.1">
+ <description brief="motion plannig packages from ros-pkg">
+ This stack contains motion planners and supporting infrastructure.
+ </description>
+ <version>0.1</version>
+ <author>Sachin Chitta sa...@wi...</author>
+ <license>BSD</license>
+ <review status="unreviewed" notes=""/>
+ <url>http://pr.willowgarage.com/wiki/motion_planning</url>
+
+ <depend stack="ros" version="0.5"/>
+</stack>
+
+
Property changes on: pkg/trunk/stacks/motion_planning/stack.xml
___________________________________________________________________
Added: svn:mergeinfo
+ /pkg/branches/gazebo-branch-merge/motion_planning/stack.xml:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <tpr...@us...> - 2009-06-25 01:22:19
|
Revision: 17639
http://personalrobots.svn.sourceforge.net/personalrobots/?rev=17639&view=rev
Author: tpratkanis
Date: 2009-06-25 00:26:16 +0000 (Thu, 25 Jun 2009)
Log Message:
-----------
Changing launch scripts for the split.
Modified Paths:
--------------
pkg/trunk/demos/2dnav_gazebo/manifest.xml
pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch
pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml
pkg/trunk/demos/test_2dnav_gazebo/manifest.xml
pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml
pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml
pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml
pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml
pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml
pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml
pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml
Modified: pkg/trunk/demos/2dnav_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/manifest.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/manifest.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -14,7 +14,7 @@
<depend package="fake_localization"/>
<depend package="teleop_base"/>
<depend package="teleop_arm_keyboard"/>
- <depend package="executive_trex_pr2"/>
+ <depend package="trex_pr2"/>
<depend package="robot_pose_ekf"/>
<depend package="pr2_gazebo"/>
<depend package="pr2_prototype1_gazebo"/>
Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -6,5 +6,5 @@
<param name="/trex/input_file" value="pr2.cfg"/>
<param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
<param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
- <node pkg="executive_trex_pr2" type="trexfast" output="screen" />
+ <node pkg="trex_pr2" type="trexfast" output="screen" />
</launch>
Modified: pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml
===================================================================
--- pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/2dnav_gazebo/trex/run_milestone_1_gazebo_empty.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -6,5 +6,5 @@
<param name="/trex/input_file" value="pr2.cfg"/>
<param name="/trex/path" value="$(find 2dnav_gazebo)/trex:$(find executive_trex_pr2)/miles_gazebo.3:$(find 2dnav_gazebo)/trex/logs:$(find executive_trex_pr2)"/>
<param name="/trex/log_dir" value="$(find 2dnav_gazebo)/trex/logs"/>
- <node pkg="executive_trex_pr2" type="trexfast" output="screen" />
+ <node pkg="trex_pr2" type="trexfast" output="screen" />
</launch>
Modified: pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch
===================================================================
--- pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/milestone2/milestone2_executive/door_domain_executive.launch 2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,3 +1,3 @@
<launch>
- <include file="$(find executive_trex_pr2)/test/doors/open_door.0/run_real.launch" />
+ <include file="$(find trex_pr2)/test/doors/open_door.0/run_real.launch" />
</launch>
Modified: pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml
===================================================================
--- pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/milestone2/milestone2_executive/manifest.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -5,5 +5,5 @@
<review status="na" notes=""/>
<url>http://pr.willowgarage.com/wiki/FIXME</url>
- <depend package="executive_trex_pr2"/>
+ <depend package="trex_pr2"/>
</package>
Modified: pkg/trunk/demos/test_2dnav_gazebo/manifest.xml
===================================================================
--- pkg/trunk/demos/test_2dnav_gazebo/manifest.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/demos/test_2dnav_gazebo/manifest.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -10,7 +10,7 @@
<depend package="map_server"/>
<depend package="fake_localization"/>
<depend package="teleop_arm_keyboard"/>
- <depend package="executive_trex_pr2"/>
+ <depend package="trex_pr2"/>
<depend package="robot_pose_ekf"/>
<depend package="pr2_gazebo"/>
<depend package="pr2_prototype1_gazebo"/>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.0/launch.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,14 +3,14 @@
<group name="wg">
<!-- Launch the node collection for a gazebo sim -->
- <include file="$(find executive_trex_pr2)/cfg/launch_gazebo.xml"/>
+ <include file="$(find trex_pr2)/cfg/launch_gazebo.xml"/>
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.0"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.0"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.0"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_arm.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="200" />
+ <test test-name="executive_trex_arm.0" pkg="trex_pr2" type="trexdebug" time-limit="200" />
</group>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.1/launch.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,14 +3,14 @@
<group name="wg">
<!-- Launch the node collection for a gazebo sim -->
- <include file="$(find executive_trex_pr2)/cfg/launch_gazebo_obstacle.xml"/>
+ <include file="$(find trex_pr2)/cfg/launch_gazebo_obstacle.xml"/>
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.1"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.1"/>
<param name="/trex/time_limit" value="500"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.1"/>
<param name="/trex/play_back" value="0"/>
- <!--node pkg="executive_trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" /-->
+ <!--node pkg="trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" /-->
</group>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/arm.2/launch.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,15 +3,15 @@
<group name="wg">
<!-- Launch the node collection for a gazebo sim -->
- <include file="$(find executive_trex_pr2)/cfg/launch_gazebo.xml"/>
+ <include file="$(find trex_pr2)/cfg/launch_gazebo.xml"/>
<param name="/trex/input_file" value="pr2.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.2"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/arm.2"/>
<param name="/trex/time_limit" value="500"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/arm.2"/>
<param name="/trex/play_back" value="0"/>
- <node pkg="executive_trex_pr2" type="trexfast" args="$(find executive_trex_pr2)/cfg/pr2.cfg" respawn="false" />
+ <node pkg="trex_pr2" type="trexfast" args="$(find trex_pr2)/cfg/pr2.cfg" respawn="false" />
</group>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/manifest.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -10,7 +10,7 @@
<url>http://pr.willowgarage.com</url>
<!--depend package="highlevel_controllers"/ Removed see ticket:1235-->
- <depend package="executive_trex_pr2"/>
+ <depend package="trex_pr2"/>
<depend package="fake_localization"/>
<depend package="map_server"/>
<depend package="nav_view"/>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.0/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.0"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.0"/>
<param name="/trex/time_limit" value="45"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.0"/>
- <test test-name="executive_trex_miles.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="60"/>
+ <test test-name="executive_trex_miles.0" pkg="trex_pr2" type="trexdebug" time-limit="60"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/run.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,7 +1,7 @@
<launch>
<master auto="start"/>
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.2"/>
- <node pkg="executive_trex_pr2" type="trexfast"/>
+ <node pkg="trex_pr2" type="trexfast"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/miles.2/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/miles.2"/>
<param name="/trex/time_limit" value="500"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/miles.2"/>
- <test test-name="executive_trex_miles.2" pkg="executive_trex_pr2" type="trexdebug" time-limit="600"/>
+ <test test-name="executive_trex_miles.2" pkg="trex_pr2" type="trexdebug" time-limit="600"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/nav.0/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -1,10 +1,10 @@
<launch>
<master auto="start"/>
- <include file="$(find executive_trex_pr2)/cfg/launch_stage.xml" />
+ <include file="$(find trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/nav.0"/>
+ <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/nav.0"/>
<param name="/trex/time_limit" value="15"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/nav.0"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_nav.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="30"/>
+ <test test-name="executive_trex_nav.0" pkg="trex_pr2" type="trexdebug" time-limit="30"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.0/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.0"/>
+ <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.0"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.0"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_wpc_0" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+ <test test-name="executive_trex_wpc_0" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.1/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.1"/>
+ <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.1"/>
<param name="/trex/time_limit" value="90"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.1"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_wpc_1" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+ <test test-name="executive_trex_wpc_1" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.2/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,8 +2,8 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.2"/>
+ <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.2"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.2"/>
- <test test-name="executive_trex_wpc_2" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+ <test test-name="executive_trex_wpc_2" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc.3/test.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/cfg/launch_stage.xml" />
<param name="/trex/input_file" value="nav.cfg"/>
- <param name="/trex/path" value="$(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.3"/>
+ <param name="/trex/path" value="$(find trex_pr2)/cfg:(find executive_trex_pr2)/cfg:$(find test_executive_trex_pr2)/wpc.3"/>
<param name="/trex/time_limit" value="45"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc.3"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_wpc_3" pkg="executive_trex_pr2" type="trexdebug" time-limit="400"/>
+ <test test-name="executive_trex_wpc_3" pkg="trex_pr2" type="trexdebug" time-limit="400"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_gazebo.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,10 +2,10 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_wg.xml" />
<param name="/trex/input_file" value="nav_gazebo.cfg"/>
- <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+ <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
<param name="/trex/play_back" value="0"/>
- <node pkg="executive_trex_pr2" type="trexfast" />
- <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+ <node pkg="trex_pr2" type="trexfast" />
+ <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/run_tables_gazebo.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,10 +2,10 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml" />
<param name="/trex/input_file" value="nav_gazebo.cfg"/>
- <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+ <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
<param name="/trex/play_back" value="0"/>
- <node pkg="executive_trex_pr2" type="trexfast" />
- <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+ <node pkg="trex_pr2" type="trexfast" />
+ <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.0/test_gazebo.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -2,9 +2,9 @@
<master auto="start"/>
<include file="$(find test_executive_trex_pr2)/wpc_gazebo.0/launch_gazebo_prototype1_tables_no_x.xml" />
<param name="/trex/input_file" value="nav_gazebo.cfg"/>
- <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find executive_trex_pr2)/cfg"/>
+ <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.0:$(find trex_pr2)/cfg:$(find executive_trex_pr2)/cfg"/>
<param name="/trex/time_limit" value="20"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.0"/>
<param name="/trex/play_back" value="0"/>
- <test test-name="executive_trex_wpc.0" pkg="executive_trex_pr2" type="trexdebug" time-limit="80"/>
+ <test test-name="executive_trex_wpc.0" pkg="trex_pr2" type="trexdebug" time-limit="80"/>
</launch>
Modified: pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml
===================================================================
--- pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml 2009-06-25 00:24:08 UTC (rev 17638)
+++ pkg/trunk/highlevel/test_executive_trex_pr2/wpc_gazebo.1/run_tables_gazebo.xml 2009-06-25 00:26:16 UTC (rev 17639)
@@ -3,11 +3,11 @@
<!--include file="$(find executive_trex_pr2)/wpc_gazebo.1/launch_gazebo_prototype1_tables_no_x.xml" /-->
<include file="$(find test_executive_trex_pr2)/wpc_gazebo.1/launch_gazebo_prototype1_wg_no_x.xml" />
<param name="/trex/input_file" value="nav_gazebo.cfg"/>
- <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.1:$(find executive_trex_pr2)/cfg"/>
+ <param name="/trex/path" value="$(find test_executive_trex_pr2)/wpc_gazebo.1:$(find executive_trex_pr2)/cfg:$(find trex_pr2)/cfg"/>
<param name="/trex/time_limit" value="2000"/>
<param name="/trex/log_dir" value="$(find test_executive_trex_pr2)/wpc_gazebo.1"/>
<param name="/trex/play_back" value="0"/>
- <node pkg="executive_trex_pr2" type="trexfast" />
+ <node pkg="trex_pr2" type="trexfast" />
<node pkg="ogre_visualizer" type="standalone_visualizer.py" />
- <test test-name="executive_trex_wpc.1" pkg="executive_trex_pr2" type="trexdebug" time-limit="40"/>
+ <test test-name="trex_wpc.1" pkg="trex_pr2" type="trexdebug" time-limit="40"/>
</launch>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X