Revision: 8012
http://playerstage.svn.sourceforge.net/playerstage/?rev=8012&view=rev
Author: gbiggs
Date: 2009-07-14 02:48:56 +0000 (Tue, 14 Jul 2009)
Log Message:
-----------
Post-refactor cleanup
Modified Paths:
--------------
code/player/trunk/cmake/UsePlayerC++.cmake.in
code/player/trunk/cmake/UsePlayerC.cmake.in
code/player/trunk/cmake/UsePlayerPlugin.cmake.in
code/player/trunk/cmake/internal/ProcessInterfaces.cmake
code/player/trunk/examples/plugins/exampleinterface/CMakeLists.txt
code/player/trunk/examples/plugins/exampleinterface/eginterf_client.c
code/player/trunk/libplayercommon/CMakeLists.txt
code/player/trunk/libplayercore/CMakeLists.txt
code/player/trunk/libplayerinterface/CMakeLists.txt
code/player/trunk/libplayerwkb/CMakeLists.txt
code/player/trunk/server/CMakeLists.txt
code/player/trunk/utils/playerjoy/CMakeLists.txt
Modified: code/player/trunk/cmake/UsePlayerC++.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -1,6 +1,7 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
CMAKE_POLICY (SET CMP0003 NEW)
+ CMAKE_POLICY (SET CMP0011 NEW)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
Modified: code/player/trunk/cmake/UsePlayerC.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC.cmake.in 2009-07-13 23:38:04 UTC (rev
8011)
+++ code/player/trunk/cmake/UsePlayerC.cmake.in 2009-07-14 02:48:56 UTC (rev
8012)
@@ -1,6 +1,7 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
CMAKE_POLICY (SET CMP0003 NEW)
+ CMAKE_POLICY (SET CMP0011 NEW)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
Modified: code/player/trunk/cmake/UsePlayerPlugin.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -1,6 +1,7 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
CMAKE_POLICY (SET CMP0003 NEW)
+ CMAKE_POLICY (SET CMP0011 NEW)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
@@ -65,7 +66,7 @@
# to have been installed in the system path (as it should have been with
Player).
MACRO (PROCESS_INTERFACES _file _outputFile)
ADD_CUSTOM_COMMAND (OUTPUT ${_outputFile}
- COMMAND playerinterfacegen.py ${ARGN} ${_file} > ${_outputFile}
+ COMMAND playerinterfacegen ${ARGN} ${_file} > ${_outputFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
DEPENDS ${_file}
)
@@ -73,7 +74,7 @@
MACRO (PROCESS_XDR _interfaceH _xdrH _xdrC)
ADD_CUSTOM_COMMAND (OUTPUT ${_xdrH} ${_xdrC}
- COMMAND playerxdrgen.py ${_interfaceH} ${_xdrC} ${_xdrH}
+ COMMAND playerxdrgen ${_interfaceH} ${_xdrC} ${_xdrH}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS ${_interfaceH})
ENDMACRO (PROCESS_XDR)
@@ -207,7 +208,12 @@
TARGET_LINK_LIBRARIES (${_interfName} ${PLUGIN_PLAYERC_LINK_LIBS})
ENDIF (PLUGIN_PLAYERC_LINK_LIBS)
GET_SOURCE_FILE_PROPERTY (currentCFlags ${xdr_c} COMPILE_FLAGS)
- SET_SOURCE_FILES_PROPERTIES (${xdr_c} PROPERTIES COMPILE_FLAGS
"-Dplayerxdr_EXPORTS ${currentCFlags}")
+ IF (currentCFlags STREQUAL "NOTFOUND")
+ SET (newCFlags "-Dplayerxdr_EXPORTS")
+ ELSE (currentCFlags STREQUAL "NOTFOUND")
+ SET (newCFlags "-Dplayerxdr_EXPORTS ${currentCFlags}")
+ ENDIF (currentCFlags STREQUAL "NOTFOUND")
+ SET_SOURCE_FILES_PROPERTIES (${xdr_c} PROPERTIES COMPILE_FLAGS
${newCFlags})
# Get the current cflags for each source file, and add the global ones
# (this allows the user to specify individual cflags for each source file
Modified: code/player/trunk/cmake/internal/ProcessInterfaces.cmake
===================================================================
--- code/player/trunk/cmake/internal/ProcessInterfaces.cmake 2009-07-13
23:38:04 UTC (rev 8011)
+++ code/player/trunk/cmake/internal/ProcessInterfaces.cmake 2009-07-14
02:48:56 UTC (rev 8012)
@@ -7,7 +7,6 @@
ENDIF (NOT PYTHONINTERP_FOUND)
MACRO (PROCESS_INTERFACES options directory outputFile)
-# FILE (GLOB INTERFACE_DEPENDENCIES ${directory}/*.def)
ADD_CUSTOM_COMMAND (OUTPUT ${outputFile}
COMMAND ${PYTHON_EXECUTABLE}
${PROJECT_SOURCE_DIR}/libplayerinterface/playerinterfacegen.py ${options}
${directory} > ${outputFile}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
Modified: code/player/trunk/examples/plugins/exampleinterface/CMakeLists.txt
===================================================================
--- code/player/trunk/examples/plugins/exampleinterface/CMakeLists.txt
2009-07-13 23:38:04 UTC (rev 8011)
+++ code/player/trunk/examples/plugins/exampleinterface/CMakeLists.txt
2009-07-14 02:48:56 UTC (rev 8012)
@@ -28,7 +28,12 @@
ADD_LIBRARY (example SHARED ${example_interface_h} ${example_xdr_h}
${example_xdr_c} eginterf_client.c ${example_functiontable_c})
TARGET_LINK_LIBRARIES (example playerc)
GET_SOURCE_FILE_PROPERTY (currentCFlags ${example_xdr_c} COMPILE_FLAGS)
-SET_SOURCE_FILES_PROPERTIES (${example_xdr_c} PROPERTIES COMPILE_FLAGS
"-Dplayerxdr_EXPORTS")
+IF (currentCFlags STREQUAL "NOTFOUND")
+ SET (newCFlags "-Dplayerxdr_EXPORTS")
+ELSE (currentCFlags STREQUAL "NOTFOUND")
+ SET (newCFlags "-Dplayerxdr_EXPORTS ${currentCFlags}")
+ENDIF (currentCFlags STREQUAL "NOTFOUND")
+SET_SOURCE_FILES_PROPERTIES (${example_xdr_c} PROPERTIES COMPILE_FLAGS
${newCFlags})
ADD_LIBRARY (example_driver SHARED ${example_interface_h} ${example_xdr_c}
${example_xdr_h} eginterf_driver.cc)
TARGET_LINK_LIBRARIES (example_driver playercore)
ADD_EXECUTABLE (example_client example_client.c ${example_interface_h})
Modified: code/player/trunk/examples/plugins/exampleinterface/eginterf_client.c
===================================================================
--- code/player/trunk/examples/plugins/exampleinterface/eginterf_client.c
2009-07-13 23:38:04 UTC (rev 8011)
+++ code/player/trunk/examples/plugins/exampleinterface/eginterf_client.c
2009-07-14 02:48:56 UTC (rev 8012)
@@ -39,6 +39,8 @@
void eginterf_destroy (eginterf_t *device)
{
playerc_device_term (&device->info);
+ if (device->stuff != NULL)
+ free (device->stuff);
free (device);
}
Modified: code/player/trunk/libplayercommon/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercommon/CMakeLists.txt 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/libplayercommon/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -1,7 +1,8 @@
SET (playercommonSrcs error.c)
+
PLAYER_ADD_LIBRARY (playercommon ${playercommonSrcs})
PLAYER_MAKE_PKGCONFIG ("playercommon" "Player error reporting and utility
library - part of the Player Project"
"" "" "" "")
-TARGET_LINK_LIBRARIES (playercommon)
-PLAYER_INSTALL_HEADERS (playercommon playercommon.h ${playerconfig_h} error.h)
+PLAYER_INSTALL_HEADERS (playercommon playercommon.h error.h)
+
Modified: code/player/trunk/libplayercore/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayercore/CMakeLists.txt 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/libplayercore/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -74,8 +74,7 @@
-PLAYER_INSTALL_HEADERS (playercore
- configfile.h
+PLAYER_INSTALL_HEADERS (playercore configfile.h
device.h
devicetable.h
driver.h
@@ -88,3 +87,4 @@
plugins.h
property.h
wallclocktime.h)
+
Modified: code/player/trunk/libplayerinterface/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayerinterface/CMakeLists.txt 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/libplayerinterface/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -4,11 +4,52 @@
MESSAGE (FATAL_ERROR "No Python interpreter found. Cannot continue.")
ENDIF (NOT PYTHONINTERP_FOUND)
-FILE (GLOB interfaceFiles ${CMAKE_CURRENT_SOURCE_DIR}/interfaces/*.def)
+SET (interfaceFiles interfaces/001_player.def
+ interfaces/002_power.def
+ interfaces/003_gripper.def
+ interfaces/004_position2d.def
+ interfaces/005_sonar.def
+ interfaces/006_laser.def
+ interfaces/007_blobfinder.def
+ interfaces/008_ptz.def
+ interfaces/009_audio.def
+ interfaces/010_fiducial.def
+ interfaces/012_speech.def
+ interfaces/013_gps.def
+ interfaces/014_bumper.def
+ interfaces/020_dio.def
+ interfaces/021_aio.def
+ interfaces/022_ir.def
+ interfaces/023_wifi.def
+ interfaces/025_localize.def
+ interfaces/026_mcom.def
+ interfaces/030_position3d.def
+ interfaces/031_simulation.def
+ interfaces/033_blinkenlight.def
+ interfaces/040_camera.def
+ interfaces/042_map.def
+ interfaces/044_planner.def
+ interfaces/045_log.def
+ interfaces/049_joystick.def
+ interfaces/050_speech_recognition.def
+ interfaces/051_opaque.def
+ interfaces/052_position1d.def
+ interfaces/053_actarray.def
+ interfaces/054_limb.def
+ interfaces/055_graphics2d.def
+ interfaces/056_rfid.def
+ interfaces/057_wsn.def
+ interfaces/058_graphics3d.def
+ interfaces/059_health.def
+ interfaces/060_imu.def
+ interfaces/061_pointcloud3d.def
+ interfaces/062_ranger.def
+ interfaces/063_vectormap.def
+ interfaces/064_blackboard.def
+ interfaces/065_stereo.def)
INCLUDE (${PLAYER_CMAKE_DIR}/internal/ProcessInterfaces.cmake)
-# More cross-directory dependency stuff. Ug.
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} ${interfaceFiles})
@@ -46,11 +87,11 @@
ENDIF (NOT HAVE_XDR)
SET (playerinterfaceSrcs ${playerxdr_h}
- ${playerxdr_c}
- functiontable.c
- addr_util.c
- interface_util.c
- ${functiontable_gen_h})
+ ${playerxdr_c}
+ functiontable.c
+ addr_util.c
+ interface_util.c
+ ${functiontable_gen_h})
IF (PLAYER_OS_QNX)
SET (interfaceLibFlag -lrpc)
@@ -59,7 +100,6 @@
ENDIF (PLAYER_OS_QNX)
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR})
-TARGET_LINK_LIBRARIES(playercommon)
PLAYER_ADD_LIBRARY (playerinterface ${playerinterfaceSrcs})
IF (PLAYER_OS_WIN)
TARGET_LINK_LIBRARIES (playerinterface Ws2_32)
@@ -72,9 +112,9 @@
IF (NOT HAVE_XDR)
TARGET_LINK_LIBRARIES (playerinterface playerreplace)
ENDIF (NOT HAVE_XDR)
-PLAYER_MAKE_PKGCONFIG ("playerinterface" "Player Interface library - part of
the Player Project" "" "" "" "${xdrLibFlag}")
+PLAYER_MAKE_PKGCONFIG ("playerinterface" "Player Interface library - part of
the Player Project"
+ "" "" "" "${interfaceLibFlag}")
-
PLAYER_INSTALL_HEADERS (playerinterface ${playerxdr_h}
addr_util.h
functiontable.h
@@ -82,5 +122,11 @@
${player_interfaces_h}
player.h)
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/playerxdrgen.py RENAME playerxdrgen
DESTINATION bin)
-INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/playerinterfacegen.py RENAME
playerintefacegen DESTINATION bin)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/playerxdrgen.py RENAME playerxdrgen
+ DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE
+ GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/playerinterfacegen.py
+ RENAME playerinterfacegen DESTINATION bin
+ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
+ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+
Modified: code/player/trunk/libplayerwkb/CMakeLists.txt
===================================================================
--- code/player/trunk/libplayerwkb/CMakeLists.txt 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/libplayerwkb/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -1,5 +1,3 @@
-LINK_DIRECTORIES (${CMAKE_BINARY_DIR}/libplayercommon)
-
SET (playerwkbSrcs playerwkb.c)
PLAYER_ADD_LIBRARY (playerwkb ${playerwkbSrcs})
Modified: code/player/trunk/server/CMakeLists.txt
===================================================================
--- code/player/trunk/server/CMakeLists.txt 2009-07-13 23:38:04 UTC (rev
8011)
+++ code/player/trunk/server/CMakeLists.txt 2009-07-14 02:48:56 UTC (rev
8012)
@@ -29,8 +29,8 @@
SET (playerSrcs server.cc)
# Server executable
ADD_EXECUTABLE (player ${playerSrcs})
-TARGET_LINK_LIBRARIES (player playerdrivers playercore playercommon
- playertcp playerudp playerinterface playerwkb
${playerreplaceLib}
+TARGET_LINK_LIBRARIES (player playerdrivers playercore playercommon playertcp
+ playerudp playerinterface playerwkb ${playerreplaceLib}
${PLAYERCORE_EXTRA_LINK_LIBRARIES})
IF (INCLUDE_RTKGUI)
TARGET_LINK_LIBRARIES (player rtk)
Modified: code/player/trunk/utils/playerjoy/CMakeLists.txt
===================================================================
--- code/player/trunk/utils/playerjoy/CMakeLists.txt 2009-07-13 23:38:04 UTC
(rev 8011)
+++ code/player/trunk/utils/playerjoy/CMakeLists.txt 2009-07-14 02:48:56 UTC
(rev 8012)
@@ -8,7 +8,8 @@
LINK_DIRECTORIES (${PLAYERCC_EXTRA_LINK_DIRS})
PLAYER_ADD_EXECUTABLE (playerjoy playerjoy.cc)
- TARGET_LINK_LIBRARIES (playerjoy playerc++ playerc playerinterface
playercommon ${PLAYERC_EXTRA_LINK_LIBRARIES}
+ TARGET_LINK_LIBRARIES (playerjoy playerc++ playerc playerinterface
+ playercommon ${PLAYERC_EXTRA_LINK_LIBRARIES}
${PLAYERCC_EXTRA_LINK_LIBRARIES}
${PTHREAD_LIB})
ELSE (BUILD_PLAYERCC)
MESSAGE (STATUS "playerjoy will not be built - playerc++ client
library is disabled")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
