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

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

Revision: 22392
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=22392&view=rev
Author:   hsujohnhsu
Date:     2009-08-20 02:25:35 +0000 (Thu, 20 Aug 2009)

Log Message:
-----------
 * moving simulators stack to simulator_gazebo.
 * patch ode dSINGLE flag passing from ODE to Gazebo.

Modified Paths:
--------------
    pkg/trunk/stacks/simulator_gazebo/CMakeLists.txt
    pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff
    pkg/trunk/stacks/simulator_gazebo/opende/opende_patch.diff

Added Paths:
-----------
    pkg/trunk/stacks/simulator_gazebo/

Removed Paths:
-------------
    pkg/trunk/stacks/simulators/

Modified: pkg/trunk/stacks/simulator_gazebo/CMakeLists.txt
===================================================================
--- pkg/trunk/stacks/simulators/CMakeLists.txt	2009-08-19 21:53:36 UTC (rev 22333)
+++ pkg/trunk/stacks/simulator_gazebo/CMakeLists.txt	2009-08-20 02:25:35 UTC (rev 22392)
@@ -16,6 +16,6 @@
 # variables.
 #list(APPEND CPACK_SOURCE_IGNORE_FILES /core/experimental)
 
-rosbuild(simulators 0.1.0)
+rosbuild(simulator_gazebo 0.1.0)
 # After next ROS release, change to new macro
 #rosbuild_make_distribution(0.1.0)

Modified: pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff
===================================================================
--- pkg/trunk/stacks/simulators/gazebo/gazebo_new_patch.diff	2009-08-19 21:53:36 UTC (rev 22333)
+++ pkg/trunk/stacks/simulator_gazebo/gazebo/gazebo_new_patch.diff	2009-08-20 02:25:35 UTC (rev 22392)
@@ -11,6 +11,26 @@
    IF (NOT PLAYER_FOUND)
      SET (INCLUDE_PLAYER OFF CACHE BOOL "Build gazebo plugin for player" FORCE)
      MESSAGE (STATUS "Warning: Player not found. The gazebo plugin for player will not be built. See the following website: http://playerstage.sourceforge.net")
+Index: cmake/FindOde.cmake
+===================================================================
+--- cmake/FindOde.cmake	(revision 8208)
++++ cmake/FindOde.cmake	(working copy)
+@@ -36,6 +36,15 @@
+ IF (NOT ODE_FOUND)
+   MESSAGE (SEND_ERROR "\nError: ODE and development files not found. See the following website: http://www.ode.org")
+ ELSE (NOT ODE_FOUND)
++  #SET (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} ${ODE_CFLAGS_OTHER}" CACHE INTERNAL "added dSINGLE" FORCE)
++  #SET (CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLAGS_DEBUG}   ${ODE_CFLAGS_OTHER}" CACHE INTERNAL "added dSINGLE" FORCE)
++  #SET (CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_PROFILE} ${ODE_CFLAGS_OTHER}" CACHE INTERNAL "added dSINGLE" FORCE)
++  #MESSAGE (STATUS "\n\ndebug\n" ${CMAKE_C_FLAGS_DEBUG} "\n\n")
++
++  APPEND_TO_CACHED_LIST(gazeboserver_cflags
++                        ${gazeboserver_cflags_desc}
++                        ${ODE_CFLAGS_OTHER})
++
+   APPEND_TO_CACHED_LIST(gazeboserver_include_dirs 
+                         ${gazeboserver_include_dirs_desc} 
+                         ${ODE_INCLUDE_DIRS})
 Index: libgazebo/Iface.cc
 ===================================================================
 --- libgazebo/Iface.cc	(revision 8208)
@@ -41,6 +61,36 @@
  
      if (this->timeout > 0 && this->GetRealTime() > this->timeout)
      {
+Index: server/rendering/CMakeLists.txt
+===================================================================
+--- server/rendering/CMakeLists.txt	(revision 8208)
++++ server/rendering/CMakeLists.txt	(working copy)
+@@ -1,5 +1,3 @@
+-include (${gazebo_cmake_dir}/GazeboUtils.cmake)
+-
+ SET (sources OgreMovableText.cc
+              OgreCreator.cc
+              OgreAdaptor.cc
+Index: server/gui/CMakeLists.txt
+===================================================================
+--- server/gui/CMakeLists.txt	(revision 8208)
++++ server/gui/CMakeLists.txt	(working copy)
+@@ -1,3 +1,5 @@
++INCLUDE (${gazebo_cmake_dir}/GazeboUtils.cmake)
++
+ SET (sources Gui.cc
+              GLWindow.cc
+              MainMenu.cc
+@@ -16,6 +18,9 @@
+              GLFrame.hh
+ )
+ 
++LIST_TO_STRING(GAZEBO_CFLAGS "${gazeboserver_cflags}")
++SET_SOURCE_FILES_PROPERTIES(${sources} PROPERTIES COMPILE_FLAGS "${GAZEBO_CFLAGS} ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}}")
++
+ #ADD_LIBRARY(gazebo_gui STATIC ${sources})
+ ADD_LIBRARY(gazebo_gui-shared SHARED ${sources})
+ 
 Index: server/World.hh
 ===================================================================
 --- server/World.hh	(revision 8208)

Modified: pkg/trunk/stacks/simulator_gazebo/opende/opende_patch.diff
===================================================================
--- pkg/trunk/stacks/simulators/opende/opende_patch.diff	2009-08-19 21:53:36 UTC (rev 22333)
+++ pkg/trunk/stacks/simulator_gazebo/opende/opende_patch.diff	2009-08-20 02:25:35 UTC (rev 22392)
@@ -1,16 +1,3 @@
-Index: include/ode/common.h
-===================================================================
---- include/ode/common.h	(revision 1689)
-+++ include/ode/common.h	(working copy)
-@@ -31,6 +31,8 @@
- #endif
- 
- 
-+#define dSINGLE
-+
- /* configuration stuff */
- 
- /* constants */
 Index: ode/src/quickstep.cpp
 ===================================================================
 --- ode/src/quickstep.cpp	(revision 1689)


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