BUILD: Remove explicit references to SVN in revision variable names.

svn-id: r55898

8 files changed, 21 insertions, 21 deletions

diff --git a/Makefile.common b/Makefile.common
index eb3165382f..1cb2936efe 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -168,9 +168,9 @@ VER_EXTRA = $(shell echo $(VERSION) | cut -d. -f 3 | cut -c2-)
 
 ifneq ($(shell svn info $(srcdir) 1>/dev/null 2>&1 || echo "error"),error)
 SVNROOT := $(srcdir)
-ifeq ($(origin VER_SVNREV), undefined)
+ifeq ($(origin VER_REV), undefined)
 # Get the working copy base revision
-VER_SVNREV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
+VER_REV := $(shell LANG=C svn info $(SVNROOT) | grep "^Revision" | cut -d ' ' -f 2)
 endif
 else
 SVNROOT := https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk/
@@ -178,8 +178,8 @@ endif
 
 # Define the Subversion revision if available, either autodetected or
 # specified by the user, but only for base/version.cpp.
-ifneq ($(origin VER_SVNREV), undefined)
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_SVN_REVISION=\"$(VER_SVNREV)\"
+ifneq ($(origin VER_REV), undefined)
+base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\"
 endif
 
 ######################################################################
@@ -187,10 +187,10 @@ endif
 ######################################################################
 
 ifeq ($(VER_EXTRA),svn)
-ifeq ($(origin VER_SVNREV), undefined)
+ifeq ($(origin VER_REV), undefined)
 DISTVERSION = $(shell date '+%Y-%m-%d')
 else
-DISTVERSION = svn$(VER_SVNREV)
+DISTVERSION = svn$(VER_REV)
 endif
 else
 DISTVERSION = $(VERSION)
@@ -204,10 +204,10 @@ $(VERFILE): $(srcdir)/base/internal_version.h
 	@$(RM_REC) $(DISTDIR)
 	@$(MKDIR) $(DISTDIR)
 	svn export $(SVNROOT) $(DISTDIR)/$(DISTNAME)
-ifneq ($(origin VER_SVNREV), undefined)
+ifneq ($(origin VER_REV), undefined)
 	@# Use the current SVN revision as a default for the snapshot sources
 	@svn cat $(SVNROOT)/base/internal_version.h | sed -e \
-		"s/^#define SCUMMVM_SVN_REVISION$$/#define SCUMMVM_SVN_REVISION \"$(VER_SVNREV)\"/g" \
+		"s/^#define SCUMMVM_REVISION$$/#define SCUMMVM_REVISION \"$(VER_REV)\"/g" \
 		> $(VERFILE)
 endif
 
diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index 2bea532b2e..5da966cf30 100644
--- a/backends/platform/dc/dreamcast.mk
+++ b/backends/platform/dc/dreamcast.mk
@@ -29,7 +29,7 @@ IP.BIN : ip.txt
 
 ip.txt : $(srcdir)/backends/platform/dc/ip.txt.in
 	if [ x"$(VER_EXTRA)" = xsvn ]; then \
-	  if [ -z "$(VER_SVNREV)" ]; then ver="SVN"; else ver="r$(VER_SVNREV)"; fi; \
+	  if [ -z "$(VER_REV)" ]; then ver="SVN"; else ver="r$(VER_REV)"; fi; \
 	else ver="V$(VERSION)"; fi; \
 	if expr "$$ver" : V...... >/dev/null; then \
 	  ver="V$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)"; fi; \
diff --git a/backends/platform/psp/psp.mk b/backends/platform/psp/psp.mk
index ed41f3d158..58f0af2a27 100644
--- a/backends/platform/psp/psp.mk
+++ b/backends/platform/psp/psp.mk
@@ -15,7 +15,7 @@ $(PSP_EXE_STRIPPED): $(EXECUTABLE)
 	$(STRIP) $< -o $@
 
 $(PSP_EBOOT_SFO): $(EXECUTABLE)
-	$(MKSFO) '$(PSP_EBOOT_TITLE) r$(VER_SVNREV) ($(DATE))' $@
+	$(MKSFO) '$(PSP_EBOOT_TITLE) r$(VER_REV) ($(DATE))' $@
 
 psp_clean:
 	$(RM) $(PSP_EXE_STRIPPED) $(PSP_EBOOT) $(PSP_EBOOT_SFO)
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 28066df8d4..aed30523b2 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -30,7 +30,7 @@ ifeq ($(GAMECUBE),1)
 else
 	$(STRIP) $(EXECUTABLE) -o wiidist/scummvm/boot.elf
 	$(CP) $(srcdir)/dists/wii/icon.png wiidist/scummvm/
-	sed "s/@REVISION@/$(VER_SVNREV)/;s/@TIMESTAMP@/`date +%Y%m%d%H%M%S`/" < $(srcdir)/dists/wii/meta.xml > wiidist/scummvm/meta.xml
+	sed "s/@REVISION@/$(VER_REV)/;s/@TIMESTAMP@/`date +%Y%m%d%H%M%S`/" < $(srcdir)/dists/wii/meta.xml > wiidist/scummvm/meta.xml
 endif
 ifeq ($(DYNAMIC_MODULES),1)
 	$(MKDIR) wiidist/scummvm/plugins
diff --git a/base/internal_version.h b/base/internal_version.h
index 78b4fbd751..55903d24bc 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -3,11 +3,11 @@
 #endif
 
 #ifdef RELEASE_BUILD
-#undef SCUMMVM_SVN_REVISION
+#undef SCUMMVM_REVISION
 #endif
 
-#ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION
+#ifndef SCUMMVM_REVISION
+#define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "1.3.0svn" SCUMMVM_SVN_REVISION
+#define SCUMMVM_VERSION "1.3.0svn" SCUMMVM_REVISION
diff --git a/base/internal_version.h.in b/base/internal_version.h.in
index f50fa6b76d..5eb3c904ee 100644
--- a/base/internal_version.h.in
+++ b/base/internal_version.h.in
@@ -3,11 +3,11 @@
 #endif
 
 #ifdef RELEASE_BUILD
-#undef SCUMMVM_SVN_REVISION
+#undef SCUMMVM_REVISION
 #endif
 
-#ifndef SCUMMVM_SVN_REVISION
-#define SCUMMVM_SVN_REVISION
+#ifndef SCUMMVM_REVISION
+#define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "@VERSION@" SCUMMVM_SVN_REVISION
+#define SCUMMVM_VERSION "@VERSION@" SCUMMVM_REVISION
diff --git a/base/plugins.h b/base/plugins.h
index 4f6d37ac86..976e606a8b 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -73,7 +73,7 @@ enum PluginType {
 };
 
 // TODO: Make the engine API version depend on ScummVM's version
-// because of the backlinking (posibly from the SVN revision)
+// because of the backlinking (posibly from the checkout revision)
 #define PLUGIN_TYPE_ENGINE_VERSION 1
 #define PLUGIN_TYPE_MUSIC_VERSION 1
 
diff --git a/tools/create_project/msbuild.cpp b/tools/create_project/msbuild.cpp
index 1bebc130dc..73511218b4 100644
--- a/tools/create_project/msbuild.cpp
+++ b/tools/create_project/msbuild.cpp
@@ -440,7 +440,7 @@ void MSBuildProvider::writeFileListToProject(const FileNode &dir, std::ofstream
 				               "\t\t\t<ObjectFileName>$(IntDir)" << (*entry).prefix << "%(Filename).obj</ObjectFileName>\n";
 
 				if (hasEnding((*entry).path, "base\\version.cpp"))
-					projectFile <<  "\t\t\t<PreprocessorDefinitions Condition=\"'$(Configuration)'=='Debug'\">SCUMMVM_SVN_REVISION#&quot; $(SCUMMVM_REVISION_STRING)&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n";
+					projectFile <<  "\t\t\t<PreprocessorDefinitions Condition=\"'$(Configuration)'=='Debug'\">SCUMMVM_REVISION#&quot; $(SCUMMVM_REVISION_STRING)&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>\n";
 
 				projectFile << "\t\t</ClCompile>\n";
 			} else {