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

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

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

Log Message:
-----------
moving gazebo simulation resouces, environment, descriptions from simulator_gazebo stack into pr2_simulator stack.

Modified Paths:
--------------
    pkg/trunk/stacks/pr2_simulator/gazebo_plugin/CMakeLists.txt
    pkg/trunk/stacks/pr2_simulator/gazebo_worlds/manifest.xml
    pkg/trunk/stacks/pr2_simulator/ikea_objects/manifest.xml
    pkg/trunk/stacks/pr2_simulator/ikea_ogre/manifest.xml
    pkg/trunk/stacks/pr2_simulator/stack.xml
    pkg/trunk/stacks/simulator_gazebo/gazebo/manifest.xml
    pkg/trunk/stacks/simulator_gazebo/opende/manifest.xml
    pkg/trunk/stacks/simulator_gazebo/stack.xml

Added Paths:
-----------
    pkg/trunk/stacks/pr2_simulator/gazebo_worlds/
    pkg/trunk/stacks/pr2_simulator/ikea_objects/
    pkg/trunk/stacks/pr2_simulator/ikea_ogre/
    pkg/trunk/stacks/pr2_simulator/pr2_ogre/

Removed Paths:
-------------
    pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/
    pkg/trunk/stacks/simulator_gazebo/ikea_ogre/
    pkg/trunk/stacks/simulator_gazebo/pr2_ogre/

Modified: pkg/trunk/stacks/pr2_simulator/gazebo_plugin/CMakeLists.txt
===================================================================

--- pkg/trunk/stacks/pr2_simulator/gazebo_plugin/CMakeLists.txt	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/pr2_simulator/gazebo_plugin/CMakeLists.txt	2009-09-02 08:35:18 UTC (rev 23683)
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.4.6)
 include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)
-set(ROS_BUILD_TYPE Release)
+set(ROS_BUILD_TYPE Debug)
 rospack(gazebo_plugin)
 genmsg()
 include_directories(msg/cpp)

Modified: pkg/trunk/stacks/pr2_simulator/gazebo_worlds/manifest.xml
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/gazebo_worlds/manifest.xml	2009-09-02 03:32:58 UTC (rev 23667)
+++ pkg/trunk/stacks/pr2_simulator/gazebo_worlds/manifest.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -3,9 +3,8 @@
   <author>John Hsu, Ioan Sucan</author>
   <license>BSD</license>
   <review status="unreviewed" notes=""/>
-  <url>http://pr.willowgarage.com/wiki/FIXME</url>
+  <url>http://ros.org/wiki/FIXME</url>
 
-  <depend package="pr2_defs"/>
   <depend package="pr2_ogre"/>
   <depend package="ikea_ogre"/>
 </package>


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

Added: svn:mergeinfo
   + 

Modified: pkg/trunk/stacks/pr2_simulator/ikea_objects/manifest.xml
===================================================================
--- pkg/trunk/robot_descriptions/ikea_objects/manifest.xml	2009-09-02 06:13:19 UTC (rev 23675)
+++ pkg/trunk/stacks/pr2_simulator/ikea_objects/manifest.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -2,7 +2,7 @@
 
   <description brief="Ikea Objects Definitions">
     
-    This package contains Ikea object mesh files
+    This package contains some Ikea object mesh files
     
   </description>
   <author>John Hsu</author>
@@ -12,6 +12,6 @@
   <depend package="xacro"/>
   <depend package="convex_decomposition"/>
   <depend package="ivcon"/>
-  <url>http://pr.willowgarage.com/wiki/RobotDescriptionFormat</url>
+  <url>http://ros.org/wiki/urdf</url>
 
 </package>

Modified: pkg/trunk/stacks/pr2_simulator/ikea_ogre/manifest.xml
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/ikea_ogre/manifest.xml	2009-09-02 03:32:58 UTC (rev 23667)
+++ pkg/trunk/stacks/pr2_simulator/ikea_ogre/manifest.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -2,8 +2,7 @@
 
   <description brief="Ikea Objects Ogre Mesh Files">
     
-    This package contains Ikea objects Ogre mesh files used for visualization and collision as
-    defined at Willow Garage.
+    This package contains Ikea objects Ogre mesh files used for simulation collision and visualization.
     
   </description>
   <author>John Hsu</author>
@@ -14,6 +13,6 @@
   <depend package="ivcon"/>
   <depend package="ogre_tools"/>
   <depend package="ikea_objects"/>
-  <url>http://pr.willowgarage.com/wiki/RobotDescriptionFormat</url>
+  <url>http://ros.org/wiki/urdf</url>
 
 </package>

Modified: pkg/trunk/stacks/pr2_simulator/stack.xml
===================================================================
--- pkg/trunk/stacks/pr2_simulator/stack.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/pr2_simulator/stack.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -9,12 +9,13 @@
   <depend stack="geometry" /> <!-- angles, bullet -->
   <depend stack="common_msgs" /> <!-- diagnostic_msgs, geometry_msgs, nav_msgs, sensor_msgs -->
   <depend stack="simulator_gazebo" /> <!-- gazebo, opende -->
-  <depend stack="pr2_mechanism" /> <!-- mechanism_control, mechanism_model, mechanism_msgs -->
+  <depend stack="pr2_mechanism" /> <!-- pr2_hardware_interface, pr2_mechanism_control, pr2_mechanism_model -->
   <depend stack="opencv" /> <!-- opencv_latest -->
   <depend stack="pr2_common" /> <!-- pr2_msgs -->
   <depend stack="camera_drivers" /> <!-- prosilica_cam -->
-  <depend stack="stereo" /> <!-- stereo_msgs -->
-  <depend stack="common" /> <!-- tinyxml -->
-  <depend stack="robot_model" /> <!-- urdf -->
+  <depend stack="image_pipeline" /> <!-- stereo_msgs -->
+  <depend stack="common" /> <!-- tinyxml, xacro -->
+  <depend stack="robot_model" /> <!-- urdf, convex_decomposition, ivcon -->
   <depend stack="ros" /> <!-- std_msgs, roscpp, rospy -->
+  <depend stack="visualization_common"/> <!-- ogre_tools --> 
 </stack>

Modified: pkg/trunk/stacks/simulator_gazebo/gazebo/manifest.xml
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/gazebo/manifest.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/simulator_gazebo/gazebo/manifest.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -5,7 +5,7 @@
   </description>
   <author>Nate Koenig, with contributions from many others. See web page for a full credits llist.</author>
   <license>LGPL</license>
-  <review status="3rdparty" notes=""/>
+  <review status="simulator_gazebo" notes=""/>
   <depend package="opende" />
   <depend package="ogre" />
   <depend package="bullet" />

Modified: pkg/trunk/stacks/simulator_gazebo/opende/manifest.xml
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/opende/manifest.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/simulator_gazebo/opende/manifest.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -7,7 +7,7 @@
 </description>
 <author>Russel Smith</author>
 <license>LGPL</license>
-<review status="3rdparty" notes=""/>
+<review status="simulator_gazebo" notes=""/>
 <url>http://opende.sf.net</url>
 <export>
   <cpp lflags="-Wl,-rpath,${prefix}/opende/lib `${prefix}/opende/bin/ode-config --libs`" cflags="`${prefix}/opende/bin/ode-config --cflags`"/>

Modified: pkg/trunk/stacks/simulator_gazebo/stack.xml
===================================================================
--- pkg/trunk/stacks/simulator_gazebo/stack.xml	2009-09-02 08:00:11 UTC (rev 23682)
+++ pkg/trunk/stacks/simulator_gazebo/stack.xml	2009-09-02 08:35:18 UTC (rev 23683)
@@ -7,12 +7,10 @@
   <review status="unreviewed" notes=""/>
   <url>http://ros.org/wiki/simulator_gazebo</url>
   
-
-  <depend stack="geometry"/> <!-- bullet, tf --> 
+  <depend stack="geometry"/> <!-- bullet, angles --> 
   <depend stack="ros"/> <!-- roscpp, std_msgs --> 
-  <depend stack="visualization_common"/> <!-- ogre, ogre_tools --> 
-  <depend stack="common_msgs"/> <!-- sensor_msgs --> 
-  <depend stack="common"/> <!-- sensor_msgs --> 
-  <depend stack="robot_model"/> <!-- sensor_msgs, ivcon, convex_decomposition --> 
+  <depend stack="common"/> <!-- tinyxml --> 
+  <depend stack="robot_model"/> <!-- urdf --> 
+  <depend stack="visualization_common"/> <!-- ogre --> 
 
 </stack>


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


