The Player Project

Revision: 6297
          http://playerstage.svn.sourceforge.net/playerstage/?rev=6297&view=rev
Author:   rtv
Date:     2008-04-10 17:54:28 -0700 (Thu, 10 Apr 2008)

Log Message:
-----------
cmake build works with modules & partially installs

Modified Paths:
--------------
    code/stage/trunk/CMakeLists.txt
    code/stage/trunk/examples/ctrl/fasr.cc
    code/stage/trunk/examples/ctrl/lasernoise.cc
    code/stage/trunk/libstage/CMakeLists.txt
    code/stage/trunk/libstage/canvas.cc
    code/stage/trunk/libstage/main.cc
    code/stage/trunk/libstage/model.cc
    code/stage/trunk/libstage/model_blinkenlight.cc
    code/stage/trunk/libstage/model_load.cc
    code/stage/trunk/libstage/stage.cc
    code/stage/trunk/libstage/worldgui.cc

Modified: code/stage/trunk/CMakeLists.txt
===================================================================

--- code/stage/trunk/CMakeLists.txt	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/CMakeLists.txt	2008-04-11 00:54:28 UTC (rev 6297)
@@ -1,5 +1,9 @@
 PROJECT(Stage)
 
+SET (STAGE_VERSION 3.0.0 CACHE STRING "Stage distribution version")
+SET (STAGE_API_VERSION 3.0.0 CACHE STRING "Stage API version")
+MESSAGE (STATUS "${PROJECT_NAME} version ${STAGE_VERSION}")
+
 include(FindPkgConfig)
 pkg_check_modules( GLIB gdk-pixbuf-2.0 )
 

Modified: code/stage/trunk/examples/ctrl/fasr.cc
===================================================================
--- code/stage/trunk/examples/ctrl/fasr.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/examples/ctrl/fasr.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -82,7 +82,6 @@
   stg_laser_sample_t* scan = robot->laser->GetSamples( &sample_count );
   assert(scan);
   
-  double newturnrate=0.0, newspeed=0.0;  
   bool obstruction = false;
   bool stop = false;
 

Modified: code/stage/trunk/examples/ctrl/lasernoise.cc
===================================================================
--- code/stage/trunk/examples/ctrl/lasernoise.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/examples/ctrl/lasernoise.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -28,7 +28,7 @@
   stg_laser_sample_t* scan = mod->GetSamples( &sample_count );
   
   if( scan )
-    for( int i=0; i<sample_count; i++ )
+    for( unsigned int i=0; i<sample_count; i++ )
       scan[i].range *= SimpleNormalDeviate( 1.0, DEVIATION );
   
   return 0; // run again

Modified: code/stage/trunk/libstage/CMakeLists.txt
===================================================================
--- code/stage/trunk/libstage/CMakeLists.txt	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/CMakeLists.txt	2008-04-11 00:54:28 UTC (rev 6297)
@@ -12,6 +12,7 @@
 	     gl.cc 
 	     glcolorstack.cc 
 	     model.cc 
+	     model_blinkenlight.cc
 	     model_callbacks.cc 
 	     model_fiducial.cc 
 	     model_laser.cc 
@@ -20,6 +21,7 @@
 	     model_ranger.cc 
 	     model_blobfinder.cc 
 	     model_props.cc 
+	     resource.cc
 	     stage.cc 
 	     typetable.cc 
 	     world.cc 
@@ -27,10 +29,7 @@
 	     worldgui.cc 
 )
 
-add_executable( stage main.cc ) 
 
-
-
 target_link_libraries( stage
 		       ${GLIB_LIBRARIES}
 		       ${FLTK_LIBRARIES} 
@@ -38,3 +37,17 @@
 		       ltdl
 )
 
+add_executable( stagebinary main.cc 
+)
+
+set_target_properties( stagebinary PROPERTIES
+		       OUTPUT_NAME stage )
+
+target_link_libraries( stagebinary
+		       stage 
+) 
+
+INSTALL(TARGETS stagebinary stage
+	RUNTIME DESTINATION bin 
+	LIBRARY DESTINATION lib
+)

Modified: code/stage/trunk/libstage/canvas.cc
===================================================================
--- code/stage/trunk/libstage/canvas.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/canvas.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -533,7 +533,7 @@
 
 
    // find all the flags
-   GList* flags = NULL;   
+   //GList* flags = NULL;   
 }
 
 void StgCanvas::resize(int X,int Y,int W,int H) 

Modified: code/stage/trunk/libstage/main.cc
===================================================================
--- code/stage/trunk/libstage/main.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/main.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -5,9 +5,12 @@
 */
 
 
-#include "config.h"
+//#include "config.h"
 #include "stage_internal.hh"
 
+const char* PACKAGE = "Stage";
+const char* VERSION = "3.dev";
+
 int main( int argc, char* argv[] )
 {
   printf( "%s %s\n", PACKAGE, VERSION );

Modified: code/stage/trunk/libstage/model.cc
===================================================================
--- code/stage/trunk/libstage/model.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/model.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -985,7 +985,7 @@
   
   glPolygonMode( GL_FRONT_AND_BACK, GL_FILL );
 
-  for( int i=0; i<blinkenlights->len; i++ )
+  for( unsigned int i=0; i<blinkenlights->len; i++ )
     {
       stg_blinkenlight_t* b = 
 	(stg_blinkenlight_t*)g_ptr_array_index( blinkenlights, i );

Modified: code/stage/trunk/libstage/model_blinkenlight.cc
===================================================================
--- code/stage/trunk/libstage/model_blinkenlight.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/model_blinkenlight.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -49,12 +49,12 @@
 //#define DEBUG 1
 #include "stage_internal.hh"
 
-static gboolean blink( bool* enabled )
-{
-  *enabled = ! *enabled;
-  puts( "blink" );
-  return true;
-}
+//static gboolean blink( bool* enabled )
+//{
+//  *enabled = ! *enabled;
+//  puts( "blink" );
+//  return true;
+//}
 
 StgModelBlinkenlight::StgModelBlinkenlight( StgWorld* world, 
 				StgModel* parent,

Modified: code/stage/trunk/libstage/model_load.cc
===================================================================
--- code/stage/trunk/libstage/model_load.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/model_load.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -415,10 +415,13 @@
     }
   else
     {
+      printf( "Libtool error: %s. Can't open your plugin controller. Quitting\n",
+	      lt_dlerror() ); // report the error from libtool
+      
       PRINT_ERR1( "Failed to open \"%s\". Check that it can be found by searching the directories in your STAGEPATH environment variable, or the current directory if STAGEPATH is not set.]\n", lib );  
       exit(-1);
     }
-      
+  
  fflush(stdout);
 }
 

Modified: code/stage/trunk/libstage/stage.cc
===================================================================
--- code/stage/trunk/libstage/stage.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/stage.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -17,7 +17,7 @@
 //#define DEBUG
 
 #include "stage_internal.hh"
-#include "config.h" // results of autoconf's system configuration tests
+//#include "config.h" // results of autoconf's system configuration tests
 
 static bool init_called = false;
 static GHashTable* typetable = NULL;

Modified: code/stage/trunk/libstage/worldgui.cc
===================================================================
--- code/stage/trunk/libstage/worldgui.cc	2008-04-10 21:24:57 UTC (rev 6296)
+++ code/stage/trunk/libstage/worldgui.cc	2008-04-11 00:54:28 UTC (rev 6297)
@@ -95,7 +95,7 @@
 
 */
 
-#include "config.h" // for PACKAGE strings etc
+//#include "config.h" // for PACKAGE strings etc
 #include "stage_internal.hh"
 #include "region.hh"
 
@@ -116,6 +116,8 @@
 static const char* MITEM_VIEW_TRAILS =     "View/Trails/Blocks";
 static const char* MITEM_VIEW_ARROWS =     "View/Trails/Arrows";
 
+// hack - get this from somewhere sensible
+const char* PACKAGE_STRING = "Stage-3.dev";
 
 void dummy_cb(Fl_Widget*, void* v) 
 {


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




Thanks for helping keep SourceForge clean.

The Player Project

Brought to you by: gerkey, inspectorg, jpgr87, natepak, and 2 others

playerstage-commit