[Scummvm-cvs-logs] scummvm master -> da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260

digitall dgturner at iee.org
Sun May 5 20:11:09 CEST 2013


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

Summary:
da1d4cc2a2 GIT: Fix build failures on new release tagging.


Commit: da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260
    https://github.com/scummvm/scummvm/commit/da1d4cc2a2d93f5257bb45fa56e8f30e0fdce260
Author: D G Turner (digitall at scummvm.org)
Date: 2013-05-05T11:17:43-07:00

Commit Message:
GIT: Fix build failures on new release tagging.

This occurs because previously when the current version was equal
to a tag i.e. v1.7.0, the output of git --describe was shortened.
This ensures that the output is of the form v1.7.0-0-gXXXXX even
when the revision is equal to the tag.

Changed paths:
    Makefile.common



diff --git a/Makefile.common b/Makefile.common
index bfbfd67..08ff411 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -171,7 +171,7 @@ 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 --long --match desc/\* | cut -d '-' -f 2-)$(VER_DIRTY)
 endif
 else
 GITROOT := git://github.com/scummvm/scummvm.git






More information about the Scummvm-git-logs mailing list