[Scummvm-cvs-logs] scummvm-tools master -> a6f0a48ca1bba0dd9dd9dee0353c6c194b0d4419

[Littleboy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
a6f0a48ca1 TOOLS: Fix Git version detection (#3324316)


Commit: a6f0a48ca1bba0dd9dd9dee0353c6c194b0d4419
    https://github.com/scummvm/scummvm-tools/commit/a6f0a48ca1bba0dd9dd9dee0353c6c194b0d4419
Author: Littleboy (littleboy at users.sourceforge.net)
Date: 2011-06-27T13:07:22-07:00

Commit Message:
TOOLS: Fix Git version detection (#3324316)

Changed paths:
    Makefile.common
    internal_version.h



diff --git a/Makefile.common b/Makefile.common
index b534a63..9d430d5 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -400,15 +400,14 @@ ifeq ($(origin VER_REV), undefined)
 # Are there uncommitted changes? (describe --dirty is only available since 1.6.6)
 VER_DIRTY := $(shell cd $(srcdir); git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo "-dirty")
 # Get the working copy base revision
-VER_REV := $(shell cd $(srcdir); git describe --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY)
+VER_REV := $(shell cd $(srcdir); git describe | cut -d '-' -f 2-)$(VER_DIRTY)
 endif
 else
 GITROOT := git://github.com/scummvm/scummvm-tools.git
 endif
 
-# Define the Subversion revision if available, either autodetected or
-# specified by the user, but only for base/version.cpp.
+# Define the Git revision if available, either autodetected or
+# specified by the user, but only for version.cpp.
 ifneq ($(origin VER_REV), undefined)
-base/version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_REVISION=\"$(VER_REV)\"
+version.o: CXXFLAGS:=$(CXXFLAGS) -DSCUMMVM_TOOLS_REVISION=\"$(VER_REV)\"
 endif
-
diff --git a/internal_version.h b/internal_version.h
index 84a735a..d00f83f 100644
--- a/internal_version.h
+++ b/internal_version.h
@@ -1,5 +1,5 @@
-#ifndef SCUMMVM_TOOLS_SVN_REVISION
-#define SCUMMVM_TOOLS_SVN_REVISION
+#ifndef SCUMMVM_TOOLS_REVISION
+#define SCUMMVM_TOOLS_REVISION
 #endif
 
-#define SCUMMVM_TOOLS_VERSION "1.3.0git" SCUMMVM_TOOLS_SVN_REVISION
+#define SCUMMVM_TOOLS_VERSION "1.3.0git" SCUMMVM_TOOLS_REVISION