[Openvas-commits] r5992 - trunk/openvas-manager

[scm-commit@wald.intevation.org]

Author: felix
Date: 2009-11-27 08:51:49 +0100 (Fri, 27 Nov 2009)
New Revision: 5992

Modified:
   trunk/openvas-manager/CMakeLists.txt
   trunk/openvas-manager/ChangeLog
Log:
* CMakeLists.txt: At configure time, add svn revision to version
number if PREPARE_RELEASE flag is not set.


Modified: trunk/openvas-manager/CMakeLists.txt
===================================================================
--- trunk/openvas-manager/CMakeLists.txt	2009-11-27 07:47:14 UTC (rev 5991)
+++ trunk/openvas-manager/CMakeLists.txt	2009-11-27 07:51:49 UTC (rev 5992)
@@ -34,6 +34,17 @@
 
 SET (CMAKE_BUILD_TYPE debug)
 
+## Retrieve svn revision (at configure time)
+IF (NOT PREPARE_RELEASE)
+  FIND_PACKAGE(Subversion)
+  IF(Subversion_FOUND)
+    Subversion_WC_INFO(${PROJECT_SOURCE_DIR} PROJECT)
+    SET(SVN_REVISION ".SVN.r${PROJECT_WC_REVISION}")
+  ELSE(Subversion_FOUND)
+    SET (SVN_REVISION ".SVN")
+  ENDIF (Subversion_FOUND)
+ENDIF (NOT PREPARE_RELEASE)
+
 ## CPack configuration
 
 set (CPACK_CMAKE_GENERATOR "Unix Makefiles")
@@ -49,7 +60,7 @@
 set (CPACK_TOPLEVEL_TAG "")
 set (CPACK_PACKAGE_VERSION_MAJOR "0")
 set (CPACK_PACKAGE_VERSION_MINOR "9")
-set (CPACK_PACKAGE_VERSION_PATCH "5.SVN")
+set (CPACK_PACKAGE_VERSION_PATCH "5${SVN_REVISION}")
 set (CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set (CPACK_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${PROJECT_NAME}-${CPACK_PACKAGE_VERSION}")

Modified: trunk/openvas-manager/ChangeLog
===================================================================
--- trunk/openvas-manager/ChangeLog	2009-11-27 07:47:14 UTC (rev 5991)
+++ trunk/openvas-manager/ChangeLog	2009-11-27 07:51:49 UTC (rev 5992)
@@ -1,3 +1,8 @@
+2009-11-27  Felix Wolfsteller <felix.wolfsteller at intevation.de>
+
+	* CMakeLists.txt: At configure time, add svn revision to version
+	number if PREPARE_RELEASE flag is not set.
+
 2009-11-26  Matthew Mundell <matthew.mundell at intevation.de>
 
 	Try to stabilise the verbatim LaTeX printing.