Revision: 7345
http://playerstage.svn.sourceforge.net/playerstage/?rev=7345&view=rev
Author: gbiggs
Date: 2009-02-19 03:47:45 +0000 (Thu, 19 Feb 2009)
Log Message:
-----------
Adding CPack support, making it work for a Windows install wizard.
Modified Paths:
--------------
code/player/trunk/CMakeLists.txt
code/player/trunk/cmake/CMakeLists.txt
code/player/trunk/cmake/internal/LibraryUtils.cmake
code/player/trunk/config/CMakeLists.txt
code/player/trunk/server/CMakeLists.txt
Added Paths:
-----------
code/player/trunk/PlayerCPackOptions.cmake.in
code/player/trunk/cmake/player.bmp
code/player/trunk/cmake/player.ico
Modified: code/player/trunk/CMakeLists.txt
===================================================================
--- code/player/trunk/CMakeLists.txt 2009-02-19 01:39:57 UTC (rev 7344)
+++ code/player/trunk/CMakeLists.txt 2009-02-19 03:47:45 UTC (rev 7345)
@@ -80,8 +80,6 @@
# Create packages
INCLUDE (InstallRequiredSystemLibraries)
-SET (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/COPYING")
-SET (CPACK_PACKAGE_VERSION_MAJOR "${PLAYER_MAJOR_VERSION}")
-SET (CPACK_PACKAGE_VERSION_MINOR "${PLAYER_MINOR_VERSION}")
-SET (CPACK_PACKAGE_VERSION_PATCH
"${PLAYER_REVISION_VERSION}${PLAYER_CANDIDATE_VERSION}")
+CONFIGURE_FILE ("${PROJECT_SOURCE_DIR}/PlayerCPackOptions.cmake.in"
"${PROJECT_BINARY_DIR}/PlayerCPackOptions.cmake" @ONLY)
+SET (CPACK_PROJECT_CONFIG_FILE
"${PROJECT_BINARY_DIR}/PlayerCPackOptions.cmake")
INCLUDE (CPack)
Added: code/player/trunk/PlayerCPackOptions.cmake.in
===================================================================
--- code/player/trunk/PlayerCPackOptions.cmake.in
(rev 0)
+++ code/player/trunk/PlayerCPackOptions.cmake.in 2009-02-19 03:47:45 UTC
(rev 7345)
@@ -0,0 +1,39 @@
+SET (CPACK_PACKAGE_NAME "@PROJECT_NAME@")
+SET (CPACK_PACKAGE_VERSION_MAJOR "@PLAYER_MAJOR_VERSION@")
+SET (CPACK_PACKAGE_VERSION_MINOR "@PLAYER_MINOR_VERSION@")
+SET (CPACK_PACKAGE_VERSION_PATCH "@PLAYER_REVISION_VERSION@")
+SET (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Player robot server")
+SET (CPACK_PACKAGE_VENDOR "Killbots, Inc.")
+SET (CPACK_PACKAGE_INSTALL_DIRECTORY "@PROJECT_NAME@ @PLAYER_VERSION@")
+SET (CPACK_PACKAGE_FILE_NAME "@project_n...@-@PLAYER_VERSION@")
+SET (CPACK_RESOURCE_FILE_LICENSE "@PROJECT_SOURCE_DIR@/COPYING")
+
+SET (CPACK_COMPONENTS_ALL applications libraries headers pkgconfig cmakestuff
samplecfg)
+SET (CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "Application files")
+SET (CPACK_COMPONENT_APPLICATIONS_DESCRIPTION "Executable application files
for the server and utilities.")
+SET (CPACK_COMPONENT_APPLICATIONS_DEPENDS libraries)
+SET (CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
+SET (CPACK_COMPONENT_LIBRARIES_DESCRIPTION "Run-time libraries required for
the server and clients.")
+SET (CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
+SET (CPACK_COMPONENT_HEADERS_DESCRIPTION "Header files necessary to compile
clients and plugins.")
+SET (CPACK_COMPONENT_HEADERS_DEPENDS libraries)
+SET (CPACK_COMPONENT_PKGCONFIG_DISPLAY_NAME "pkg-config files")
+SET (CPACK_COMPONENT_PKGCONFIG_DESCRIPTION "Files for the pkg-config
configuration system.")
+SET (CPACK_COMPONENT_PKGCONFIG_DEPENDS libraries headers)
+SET (CPACK_COMPONENT_CMAKESTUFF_DISPLAY_NAME "CMake modules")
+SET (CPACK_COMPONENT_CMAKESTUFF_DESCRIPTION "Modules for CMake to aid in
writing client and plugin CMakeLists.txt files.")
+SET (CPACK_COMPONENT_CMAKESTUFF_DEPENDS libraries headers)
+SET (CPACK_COMPONENT_SAMPLECFG_DISPLAY_NAME "Sample configuration files")
+SET (CPACK_COMPONENT_SAMPLECFG_DESCRIPTION "Sample configuration files for use
with the server.")
+SET (CPACK_COMPONENT_SAMPLECFG_DEPENDS applications)
+
+IF (WIN32)
+ SET (CPACK_NSIS_MUI_ICON "@PROJECT_SOURCE_DIR@/cmake\\player.ico")
+ SET (CPACK_NSIS_MUI_UNIICON "@PROJECT_SOURCE_DIR@/cmake\\player.ico")
+ SET (CPACK_PACKAGE_ICON "@PROJECT_SOURCE_DIR@/cmake\\player.bmp")
+ SET (CPACK_NSIS_HELP_LINK "http://playerstage.sourceforce.net";)
+ SET (CPACK_NSIS_URL_INFO_ABOUT "http://playerstage.sourceforce.net";)
+ # Add to PATH
+ SET (CPACK_NSIS_MODIFY_PATH ON)
+ENDIF (WIN32)
+
Modified: code/player/trunk/cmake/CMakeLists.txt
===================================================================
--- code/player/trunk/cmake/CMakeLists.txt 2009-02-19 01:39:57 UTC (rev
7344)
+++ code/player/trunk/cmake/CMakeLists.txt 2009-02-19 03:47:45 UTC (rev
7345)
@@ -3,8 +3,8 @@
SET (playerModules ${CMAKE_CURRENT_BINARY_DIR}/UsePlayerC.cmake
${CMAKE_CURRENT_BINARY_DIR}/UsePlayerPlugin.cmake
PlayerUtils.cmake)
-INSTALL (FILES ${playerModules} DESTINATION share/cmake/Modules/)
+INSTALL (FILES ${playerModules} DESTINATION share/cmake/Modules/ COMPONENT
cmakestuff)
IF (BUILD_PLAYERCC)
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/UsePlayerC++.cmake DESTINATION
share/cmake/Modules/)
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/UsePlayerC++.cmake DESTINATION
share/cmake/Modules/ COMPONENT cmakestuff)
ENDIF (BUILD_PLAYERCC)
Modified: code/player/trunk/cmake/internal/LibraryUtils.cmake
===================================================================
--- code/player/trunk/cmake/internal/LibraryUtils.cmake 2009-02-19 01:39:57 UTC
(rev 7344)
+++ code/player/trunk/cmake/internal/LibraryUtils.cmake 2009-02-19 03:47:45 UTC
(rev 7345)
@@ -11,7 +11,6 @@
# PLAYER_ADD_LIBRARY (_name)
# Adds a library to be built and installed and sets some common properties on
it.
MACRO (PLAYER_ADD_LIBRARY _name)
-# MESSAGE (STATUS "Building library ${name} with sources ${ARGN}")
ADD_LIBRARY (${_name} ${ARGN})
SET_TARGET_PROPERTIES (${_name} PROPERTIES
VERSION ${PLAYER_VERSION}
@@ -19,7 +18,7 @@
INSTALL_NAME_DIR ${RPATH_VAL}
INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
BUILD_WITH_INSTALL_RPATH TRUE)
- INSTALL (TARGETS ${_name} DESTINATION lib/)
+ INSTALL (TARGETS ${_name} DESTINATION lib/ COMPONENT libraries)
ENDMACRO (PLAYER_ADD_LIBRARY)
@@ -27,12 +26,11 @@
# PLAYER_ADD_EXECUTABLE (_name)
# Adds an executable to be built and installed and sets some common properties
on it.
MACRO (PLAYER_ADD_EXECUTABLE _name)
-# MESSAGE (STATUS "Building library ${name} with sources ${ARGN}")
ADD_EXECUTABLE (${_name} ${ARGN})
SET_TARGET_PROPERTIES (${_name} PROPERTIES
INSTALL_RPATH
"${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib"
BUILD_WITH_INSTALL_RPATH TRUE)
- INSTALL (TARGETS ${_name} RUNTIME DESTINATION bin/)
+ INSTALL (TARGETS ${_name} RUNTIME DESTINATION bin/ COMPONENT applications)
ENDMACRO (PLAYER_ADD_EXECUTABLE)
@@ -143,7 +141,7 @@
ENDIF (${_intDeps})
CONFIGURE_FILE (${PLAYER_CMAKE_DIR}/pkgconfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc @ONLY)
- INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION
lib/pkgconfig/)
+ INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/${_name}.pc DESTINATION
lib/pkgconfig/ COMPONENT pkgconfig)
ENDMACRO (PLAYER_MAKE_PKGCONFIG)
@@ -152,5 +150,6 @@
# Installs header files
MACRO (PLAYER_INSTALL_HEADERS _subdir)
INSTALL (FILES ${ARGN}
- DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR}/lib${_subdir})
+ DESTINATION ${PLAYER_INCLUDE_INSTALL_DIR}/lib${_subdir}
+ COMPONENT headers)
ENDMACRO (PLAYER_INSTALL_HEADERS)
Added: code/player/trunk/cmake/player.bmp
===================================================================
(Binary files differ)
Property changes on: code/player/trunk/cmake/player.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: code/player/trunk/cmake/player.ico
===================================================================
(Binary files differ)
Property changes on: code/player/trunk/cmake/player.ico
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: code/player/trunk/config/CMakeLists.txt
===================================================================
--- code/player/trunk/config/CMakeLists.txt 2009-02-19 01:39:57 UTC (rev
7344)
+++ code/player/trunk/config/CMakeLists.txt 2009-02-19 03:47:45 UTC (rev
7345)
@@ -37,4 +37,4 @@
writelog.cfg
wsn.cfg)
-INSTALL (FILES ${sampleConfigFiles} DESTINATION
"share/${PROJECT_NAME_LOWER}/config")
+INSTALL (FILES ${sampleConfigFiles} DESTINATION
"share/${PROJECT_NAME_LOWER}/config" COMPONENT samplecfg)
Modified: code/player/trunk/server/CMakeLists.txt
===================================================================
--- code/player/trunk/server/CMakeLists.txt 2009-02-19 01:39:57 UTC (rev
7344)
+++ code/player/trunk/server/CMakeLists.txt 2009-02-19 03:47:45 UTC (rev
7345)
@@ -47,7 +47,7 @@
IF (PLAYER_DRIVERSLIB_LINKFLAGS)
TARGET_LINK_LIBRARIES (player ${PLAYER_DRIVERSLIB_LINKFLAGS})
ENDIF (PLAYER_DRIVERSLIB_LINKFLAGS)
-INSTALL (TARGETS player DESTINATION bin/)
+INSTALL (TARGETS player DESTINATION bin/ COMPONENT applications)
# Clean up stuff from the drivers
PLAYERDRIVER_RESET_LISTS ()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
