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

[<hsu...@us...>]

Revision: 23686
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=23686&view=rev
Author:   hsujohnhsu
Date:     2009-09-02 08:57:17 +0000 (Wed, 02 Sep 2009)

Log Message:
-----------
moving per ticket #2710

Modified Paths:
--------------
    pkg/trunk/drivers/stack.xml
    pkg/trunk/stacks/pr2_simulator/stack.xml
    pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/manifest.xml
    pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo/manifest.xml

Added Paths:
-----------
    pkg/trunk/stacks/pr2_simulator/test_gazebo_plugin/
    pkg/trunk/stacks/pr2_simulator/test_pr2_collision_gazebo/
    pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/
    pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo/

Removed Paths:
-------------
    pkg/trunk/drivers/simulator/test_gazebo_plugin/
    pkg/trunk/drivers/simulator/test_pr2_collision_gazebo/
    pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/
    pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/

Modified: pkg/trunk/drivers/stack.xml
===================================================================
--- pkg/trunk/drivers/stack.xml	2009-09-02 08:55:35 UTC (rev 23685)
+++ pkg/trunk/drivers/stack.xml	2009-09-02 08:57:17 UTC (rev 23686)
@@ -16,7 +16,6 @@
   <depend stack="controllers"/> <!-- pr2_mechanism_controllers, robot_mechanism_controllers -->
   <depend stack="opencv"/> <!-- opencv_latest -->
   <depend stack="3rdparty"/> <!-- player -->
-  <depend stack="pr2_simulator"/> <!-- gazebo_plugin -->
   <depend stack="diagnostics"/> <!-- diagnostic_updater -->
   <depend stack="calibration_experimental"/> <!-- mocap_msgs -->
   <depend stack="pr2_common"/> <!-- pr2_ogre, pr2_msgs -->

Modified: pkg/trunk/stacks/pr2_simulator/stack.xml
===================================================================
--- pkg/trunk/stacks/pr2_simulator/stack.xml	2009-09-02 08:55:35 UTC (rev 23685)
+++ pkg/trunk/stacks/pr2_simulator/stack.xml	2009-09-02 08:57:17 UTC (rev 23686)
@@ -18,4 +18,9 @@
   <depend stack="robot_model" /> <!-- urdf, convex_decomposition, ivcon -->
   <depend stack="ros" /> <!-- std_msgs, roscpp, rospy -->
   <depend stack="visualization_common"/> <!-- ogre_tools --> 
+
+  <!-- added for tests -->
+  <!--depend stack="semantic_mapping"/--> <!-- semantic_point_annotator, causes circular dependency --> 
+  <depend stack="laser_pipeline"/> <!-- laser_filters --> 
+  <depend stack="image_pipeline"/> <!-- stereo_image_proc --> 
 </stack>


Property changes on: pkg/trunk/stacks/pr2_simulator/test_gazebo_plugin
___________________________________________________________________
Added: svn:ignore
   + .build_version
.rosgcov_files
bin

Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/drivers/simulator/test_gazebo_plugin: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_simulator/test_pr2_collision_gazebo
___________________________________________________________________
Added: svn:ignore
   + .build_version
.rosgcov_files
bin

Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/drivers/simulator/test_pr2_collision_gazebo: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_simulator/test_pr2_mechanism_controllers_gazebo
___________________________________________________________________
Added: svn:ignore
   + .build_version
.rosgcov_files
bin

Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/drivers/simulator/test_pr2_mechanism_controllers_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334

Modified: pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_mechanism_controllers_gazebo/manifest.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/pr2_simulator/test_pr2_mechanism_controllers_gazebo/manifest.xml	2009-09-02 08:57:17 UTC (rev 23686)
@@ -9,8 +9,8 @@
   <depend package="rospy"/>
   <depend package="rostest"/>
   <depend package="gazebo_plugin"/>
+  <depend package="pr2_mechanism_controllers" />
   <depend package="arm_gazebo" />
-  <depend package="pr2_mechanism_controllers" />
   <depend package="pr2_gazebo" />
   <depend package="pr2_ogre" />
   <depend package="gazebo_worlds" />


Property changes on: pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo
___________________________________________________________________
Added: svn:ignore
   + .build_version
.rosgcov_files
bin

Added: svn:mergeinfo
   + /pkg/branches/gazebo-branch-merge/drivers/simulator/test_pr2_sensors_gazebo:15683-15684,15739-15794,15797-15820,15822-15839,15852-15870,15983-16008,16010-16016,16129-16141,16145-16169,16245-16262,16274-16334

Modified: pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo/manifest.xml
===================================================================
--- pkg/trunk/drivers/simulator/test_pr2_sensors_gazebo/manifest.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/pr2_simulator/test_pr2_sensors_gazebo/manifest.xml	2009-09-02 08:57:17 UTC (rev 23686)
@@ -20,9 +20,9 @@
   <!-- for laser scan -->
   <depend package="pr2_mechanism_control"/>
   <depend package="pr2_mechanism_controllers"/>
-  <depend package="semantic_point_annotator"/>
-  <depend package="laser_filters"/>
-  <depend package="mux"/>
-  <depend package="robot_self_filter"/>
+  <depend package="semantic_point_annotator"/> <!-- in semantic_mapping -->
+  <depend package="laser_filters"/> <!-- in laser_pipeline -->
+  <depend package="robot_self_filter"/> <!-- in motion_planning/non-stack -->
+  <depend package="mux"/> <!-- deprecated, udpate 2dnav_pr2 launch scripts? -->
 
 </package>


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