[Scummvm-cvs-logs] SF.net SVN: scummvm:[39431] scummvm/trunk

[dhewg at users.sourceforge.net]

Revision: 39431
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39431&view=rev
Author:   dhewg
Date:     2009-03-15 21:17:37 +0000 (Sun, 15 Mar 2009)

Log Message:
-----------
Added the SVN revision to SCUMMVM_VERSION. The variable has be be set externally, e.g. 'make SCUMMVM_SVN_REVISION=x'

Modified Paths:
--------------
    scummvm/trunk/Makefile
    scummvm/trunk/Makefile.common
    scummvm/trunk/base/internal_version.h
    scummvm/trunk/base/internal_version.h.in

Modified: scummvm/trunk/Makefile
===================================================================
--- scummvm/trunk/Makefile	2009-03-15 20:31:29 UTC (rev 39430)
+++ scummvm/trunk/Makefile	2009-03-15 21:17:37 UTC (rev 39431)
@@ -30,6 +30,10 @@
 # Disable RTTI and exceptions, and enabled checking of pointers returned by "new"
 CXXFLAGS+= -fno-rtti -fno-exceptions -fcheck-new
 
+ifneq "$(SCUMMVM_SVN_REVISION)" ""
+CXXFLAGS+= -DSCUMMVM_SVN_REVISION=\"$(SCUMMVM_SVN_REVISION)\"
+endif
+
 # There is a nice extra warning that flags variables that are potentially
 # used before being initialized. Very handy to catch a certain kind of
 # bugs. Unfortunately, it only works when optimizations are turned on,

Modified: scummvm/trunk/Makefile.common
===================================================================
--- scummvm/trunk/Makefile.common	2009-03-15 20:31:29 UTC (rev 39430)
+++ scummvm/trunk/Makefile.common	2009-03-15 21:17:37 UTC (rev 39431)
@@ -118,7 +118,7 @@
 	$(srcdir)/dists/iphone/Info.plist \
 	$(srcdir)/dists/macosx/Info.plist
 
-VERSION = $(shell cat "${srcdir}/base/internal_version.h" | cut -d\" -f2)
+VERSION = $(shell tail -n 1 "${srcdir}/base/internal_version.h" | cut -d\" -f2)
 VER_MAJOR = $(shell echo $(VERSION) | cut -d. -f 1)
 VER_MINOR = $(shell echo $(VERSION) | cut -d. -f 2)
 VER_PATCH = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c1)

Modified: scummvm/trunk/base/internal_version.h
===================================================================
--- scummvm/trunk/base/internal_version.h	2009-03-15 20:31:29 UTC (rev 39430)
+++ scummvm/trunk/base/internal_version.h	2009-03-15 21:17:37 UTC (rev 39431)
@@ -1 +1,5 @@
-#define SCUMMVM_VERSION "0.14.0svn"
+#ifndef SCUMMVM_SVN_REVISION
+#define SCUMMVM_SVN_REVISION
+#endif
+
+#define SCUMMVM_VERSION "0.14.0svn" SCUMMVM_SVN_REVISION

Modified: scummvm/trunk/base/internal_version.h.in
===================================================================
--- scummvm/trunk/base/internal_version.h.in	2009-03-15 20:31:29 UTC (rev 39430)
+++ scummvm/trunk/base/internal_version.h.in	2009-03-15 21:17:37 UTC (rev 39431)
@@ -1 +1,5 @@
-#define SCUMMVM_VERSION "@VERSION@"
+#ifndef SCUMMVM_SVN_REVISION
+#define SCUMMVM_SVN_REVISION
+#endif
+
+#define SCUMMVM_VERSION "@VERSION@" SCUMMVM_SVN_REVISION


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