Revision: 6388
http://playerstage.svn.sourceforge.net/playerstage/?rev=6388&view=rev
Author: gerkey
Date: 2008-04-28 15:11:45 -0700 (Mon, 28 Apr 2008)
Log Message:
-----------
fixed various small build issues
Modified Paths:
--------------
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayercore/addr_util.h
code/player/trunk/server/drivers/laser/CMakeLists.txt
code/player/trunk/server/drivers/shell/writelog.cc
Removed Paths:
-------------
code/player/trunk/libplayercore/playerconfig.h
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2008-04-28 20:22:20 UTC
(rev 6387)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2008-04-28 22:11:45 UTC
(rev 6388)
@@ -6,6 +6,19 @@
MESSAGE (FATAL_ERROR "No Python interpreter found. Cannot continue.")
ENDIF (NOT PYTHONINTERP_FOUND)
+# Auto-generate playerconfig.h. This should be improved
+SET (playerconfig.h "${CMAKE_CURRENT_BINARY_DIR}/playerconfig.h")
+IF (HAVE_STDINT_H)
+ FILE (WRITE ${playerconfig.h}
+"#include <sys/types.h>
+#include <stdint.h>
+")
+ELSE (HAVE_STDINT_H)
+ FILE (WRITE ${playerconfig.h}
+"#include <sys/types.h>
+")
+ENDIF (HAVE_STDINT_H)
+
SET (player_interfaces_h "${CMAKE_CURRENT_BINARY_DIR}/player_interfaces.h")
SET (interface_table_h "${CMAKE_CURRENT_BINARY_DIR}/interface_table.h")
PROCESS_INTERFACES ("" ${CMAKE_CURRENT_SOURCE_DIR}/interfaces
${player_interfaces_h})
@@ -63,5 +76,5 @@
PLAYER_INSTALL_HEADERS (playercore
addr_util.h configfile.h device.h devicetable.h driver.h drivertable.h
error.h globals.h
- interface_util.h message.h playercommon.h playerconfig.h playercore.h
player.h
+ interface_util.h message.h playercommon.h ${playerconfig.h} playercore.h
player.h
${player_interfaces_h} playertime.h plugins.h property.h wallclocktime.h)
Modified: code/player/trunk/libplayercore/addr_util.h
===================================================================
--- code/player/trunk/libplayercore/addr_util.h 2008-04-28 20:22:20 UTC (rev
6387)
+++ code/player/trunk/libplayercore/addr_util.h 2008-04-28 22:11:45 UTC (rev
6388)
@@ -43,13 +43,8 @@
extern "C" {
#endif
-#include <config.h>
+#include <libplayercore/playerconfig.h>
-#include <sys/types.h>
-#if HAVE_STDINT_H
- #include <stdint.h>
-#endif
-
void packedaddr_to_dottedip(char* dest, size_t len, uint32_t addr);
int hostname_to_packedaddr(uint32_t* dest, const char* hostname);
Deleted: code/player/trunk/libplayercore/playerconfig.h
===================================================================
--- code/player/trunk/libplayercore/playerconfig.h 2008-04-28 20:22:20 UTC
(rev 6387)
+++ code/player/trunk/libplayercore/playerconfig.h 2008-04-28 22:11:45 UTC
(rev 6388)
@@ -1,34 +0,0 @@
-#include <config.h>
-
-/* make sure we get the various types like 'uint8_t
- *
- * int8_t : signed 1 byte (char)
- * int16_t : signed 2 bytes (short)
- * int32_t : signed 4 bytes (int)
- * int64_t : signed 8 bytes (long)
- *
- * uint8_t : unsigned 1 byte (unsigned char)
- * uint16_t : unsigned 2 bytes (unsigned short)
- * uint32_t : unsigned 4 bytes (unsigned int)
- * uint64_t : unsigned 8 bytes (unsigned long)
- */
-
-#include <sys/types.h>
-#if HAVE_STDINT_H
- #include <stdint.h>
-#endif
-
-/*
- * 64-bit conversion macros
- */
-#if WORDS_BIGENDIAN
- #define htonll(n) (n)
-#else
- #define htonll(n) ((((unsigned long long) htonl(n)) << 32) + htonl((n) >>
32))
-#endif
-
-#if WORDS_BIGENDIAN
- #define ntohll(n) (n)
-#else
- #define ntohll(n) ((((unsigned long long)ntohl(n)) << 32) + ntohl((n) >> 32))
-#endif
Modified: code/player/trunk/server/drivers/laser/CMakeLists.txt
===================================================================
--- code/player/trunk/server/drivers/laser/CMakeLists.txt 2008-04-28
20:22:20 UTC (rev 6387)
+++ code/player/trunk/server/drivers/laser/CMakeLists.txt 2008-04-28
22:11:45 UTC (rev 6388)
@@ -28,8 +28,12 @@
PLAYERDRIVER_ADD_DRIVER_SIMPLE (lasercutter build_lasercutter lasercutter.cc
lasertransform.cc)
PLAYERDRIVER_OPTION (urglaser build_urglaser ON)
-PLAYERDRIVER_REQUIRE_HEADER (urglaser build_urglaser linux/serial.h)
+#PLAYERDRIVER_REQUIRE_HEADER (urglaser build_urglaser linux/serial.h)
PLAYERDRIVER_ADD_DRIVER_SIMPLE (urglaser build_urglaser urg_laser.cc
urglaserdriver.cc)
+# Also build and install standalone non-Player lib
+PLAYER_ADD_LIBRARY (urglaser_standalone urg_laser.cc)
+PLAYER_INSTALL_HEADERS (standalone_drivers urg_laser.h)
+
PLAYERDRIVER_OPTION (rs4leuze build_rs4leuze ON)
-PLAYERDRIVER_ADD_DRIVER_SIMPLE (rs4leuze build_rs4leuze RS4LeuzeLaserDriver.cc
RS4Leuze_laser.cc)
\ No newline at end of file
+PLAYERDRIVER_ADD_DRIVER_SIMPLE (rs4leuze build_rs4leuze RS4LeuzeLaserDriver.cc
RS4Leuze_laser.cc)
Modified: code/player/trunk/server/drivers/shell/writelog.cc
===================================================================
--- code/player/trunk/server/drivers/shell/writelog.cc 2008-04-28 20:22:20 UTC
(rev 6387)
+++ code/player/trunk/server/drivers/shell/writelog.cc 2008-04-28 22:11:45 UTC
(rev 6388)
@@ -150,9 +150,7 @@
*/
/** @} */
-#ifdef HAVE_CONFIG_H
- #include "config.h"
-#endif
+#include "config.h"
#include <assert.h>
#include <ctype.h>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
