diff options
| author | Johannes Schickel | 2010-11-19 16:47:03 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-11-19 16:47:03 +0000 |
| commit | 0f26184f8da44175af235378a0620beb7715fb11 (patch) | |
| tree | dfcb5f7ab84b6e3a7c7bbc356d2ba980f5adde7c | |
| parent | a24d5ba2f402d76bdc38e2e051f5e22389671207 (diff) | |
| download | scummvm-rg350-0f26184f8da44175af235378a0620beb7715fb11.tar.gz scummvm-rg350-0f26184f8da44175af235378a0620beb7715fb11.tar.bz2 scummvm-rg350-0f26184f8da44175af235378a0620beb7715fb11.zip | |
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.
svn-id: r54383
| -rw-r--r-- | base/internal_version.h | 7 | ||||
| -rw-r--r-- | base/internal_version.h.in | 7 | ||||
| -rwxr-xr-x | tools/update-version.pl | 3 |
3 files changed, 7 insertions, 10 deletions
diff --git a/base/internal_version.h b/base/internal_version.h index 2b00ce60d2..78b4fbd751 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -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 diff --git a/base/internal_version.h.in b/base/internal_version.h.in index dacaf72d40..f50fa6b76d 100644 --- a/base/internal_version.h.in +++ b/base/internal_version.h.in @@ -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 diff --git a/tools/update-version.pl b/tools/update-version.pl index f8a46b9a7e..81aa5c27f9 100755 --- a/tools/update-version.pl +++ b/tools/update-version.pl @@ -49,8 +49,7 @@ my %subs = ( VER_MINOR => $VER_MINOR, VER_PATCH => $VER_PATCH, VER_EXTRA => $VER_EXTRA, - VERSION => $VERSION, - SVN_REVISION=> "", + VERSION => $VERSION ); foreach my $file (@subs_files) { |