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

[lordhoto at users.sourceforge.net]

Revision: 54383
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54383&view=rev
Author:   lordhoto
Date:     2010-11-19 16:47:03 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
BUILD: Revert r53427.

create_project will now use a different approach than recreating
base/internal_version.h. This is also because recreating this file might
result in accidental commits of the modified file and thus "screw up" the
version string on different systems.

Modified Paths:
--------------
    scummvm/trunk/base/internal_version.h
    scummvm/trunk/base/internal_version.h.in
    scummvm/trunk/tools/update-version.pl

Modified: scummvm/trunk/base/internal_version.h
===================================================================
--- scummvm/trunk/base/internal_version.h	2010-11-19 14:19:02 UTC (rev 54382)
+++ scummvm/trunk/base/internal_version.h	2010-11-19 16:47:03 UTC (rev 54383)
@@ -2,12 +2,11 @@
 #error This file may only be included by base/version.cpp
 #endif
 
-#ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION ""
-#endif
-
 #ifdef RELEASE_BUILD
 #undef SCUMMVM_SVN_REVISION
+#endif
+
+#ifndef SCUMMVM_SVN_REVISION
 #define SCUMMVM_SVN_REVISION
 #endif
 

Modified: scummvm/trunk/base/internal_version.h.in
===================================================================
--- scummvm/trunk/base/internal_version.h.in	2010-11-19 14:19:02 UTC (rev 54382)
+++ scummvm/trunk/base/internal_version.h.in	2010-11-19 16:47:03 UTC (rev 54383)
@@ -2,12 +2,11 @@
 #error This file may only be included by base/version.cpp
 #endif
 
-#ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION "@SVN_REVISION@"
-#endif
-
 #ifdef RELEASE_BUILD
 #undef SCUMMVM_SVN_REVISION
+#endif
+
+#ifndef SCUMMVM_SVN_REVISION
 #define SCUMMVM_SVN_REVISION
 #endif
 

Modified: scummvm/trunk/tools/update-version.pl
===================================================================
--- scummvm/trunk/tools/update-version.pl	2010-11-19 14:19:02 UTC (rev 54382)
+++ scummvm/trunk/tools/update-version.pl	2010-11-19 16:47:03 UTC (rev 54383)
@@ -49,8 +49,7 @@
 	VER_MINOR	=>	$VER_MINOR,
 	VER_PATCH	=>	$VER_PATCH,
 	VER_EXTRA	=>	$VER_EXTRA,
-	VERSION		=>	$VERSION,
-	SVN_REVISION=>	"",
+	VERSION		=>	$VERSION
 	);
 
 foreach my $file (@subs_files) {


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