[rkward-cvs] SF.net SVN: rkward:[4165] trunk/rkward

[m-eik at users.sourceforge.net]

Revision: 4165
          http://rkward.svn.sourceforge.net/rkward/?rev=4165&view=rev
Author:   m-eik
Date:     2012-03-06 11:46:57 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
restored VERSION.cmake and moved manual versioning option to SetVersionNumber.cmake

Modified Paths:
--------------
    trunk/rkward/VERSION.cmake
    trunk/rkward/rkward/SetVersionNumber.cmake
    trunk/rkward/scripts/set_dist_version.sh

Modified: trunk/rkward/VERSION.cmake
===================================================================
--- trunk/rkward/VERSION.cmake	2012-03-05 17:16:33 UTC (rev 4164)
+++ trunk/rkward/VERSION.cmake	2012-03-06 11:46:57 UTC (rev 4165)
@@ -1,5 +1 @@
-# the IF condition enables manual setting of the version number string
-# which allows for different versioning needed for MacPorts
-IF(NOT RKVERSION_NUMBER)
-	SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)
-ENDIF(NOT RKVERSION_NUMBER)
+SET(RKVERSION_NUMBER 0.5.7z+0.5.8+devel1)

Modified: trunk/rkward/rkward/SetVersionNumber.cmake
===================================================================
--- trunk/rkward/rkward/SetVersionNumber.cmake	2012-03-05 17:16:33 UTC (rev 4164)
+++ trunk/rkward/rkward/SetVersionNumber.cmake	2012-03-06 11:46:57 UTC (rev 4165)
@@ -1,5 +1,9 @@
-# set version number
-INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
+# the IF condition enables manual setting of the version number string
+# which allows for different versioning needed for MacPorts
+IF(NOT RKVERSION_NUMBER)
+	# set version number
+	INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake)
+ENDIF(NOT RKVERSION_NUMBER)
 
 # replace placeholders with version number in several files
 CONFIGURE_FILE(

Modified: trunk/rkward/scripts/set_dist_version.sh
===================================================================
--- trunk/rkward/scripts/set_dist_version.sh	2012-03-05 17:16:33 UTC (rev 4164)
+++ trunk/rkward/scripts/set_dist_version.sh	2012-03-06 11:46:57 UTC (rev 4165)
@@ -7,4 +7,6 @@
 cd `dirname $0`/..
 BASEDIR=`pwd`
 
-echo "SET(RKVERSION_NUMBER $VERSION)" > $BASEDIR/VERSION.cmake
+echo "# DO NOT CHANGE THIS FILE MANUALLY!
+# It will be overwritten by scripts/set_dist_version.sh
+SET(RKVERSION_NUMBER $VERSION)" > $BASEDIR/VERSION.cmake

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