[Scummvm-cvs-logs] scummvm master -> 106380d481a2fe841d89ff05ab0a54f4cdaee918

zeldin marcus at mc.pp.se
Fri Feb 18 20:13:58 CET 2011


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:
106380d481 DC: Don't use $(VER_REV) with git


Commit: 106380d481a2fe841d89ff05ab0a54f4cdaee918
    https://github.com/scummvm/scummvm/commit/106380d481a2fe841d89ff05ab0a54f4cdaee918
Author: Marcus Comstedt (marcus at mc.pp.se)
Date: 2011-02-18T11:12:16-08:00

Commit Message:
DC: Don't use $(VER_REV) with git

It seems unlikely that git will ever be able to produce a $(VER_REV)
of 6 characters or less (the requirement for the version field in
IP.BIN), so don't even try to use it.

Changed paths:
    backends/platform/dc/dreamcast.mk



diff --git a/backends/platform/dc/dreamcast.mk b/backends/platform/dc/dreamcast.mk
index d53af90..8651a29 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)" = xgit ]; then \
-	  if [ -z "$(VER_REV)" ]; then ver="GIT"; else ver="r$(VER_REV)"; fi; \
+	  ver="GIT"; \
 	else ver="V$(VERSION)"; fi; \
 	if expr "$$ver" : V...... >/dev/null; then \
 	  ver="V$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)"; fi; \






More information about the Scummvm-git-logs mailing list