From e30657f73fa327f6dbf13ab2f38af268698bc8ff Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Tue, 15 Mar 2011 11:12:34 +0100 Subject: [PATCH] set 1.4.0 release version --- Makefile.defs | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 9940cc51..7c0246bd 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -3,29 +3,29 @@ else makefile_defs=1 export makefile_defs -GIT = $(shell which git) -SVNVERSION = $(shell which svnversion) - -ifneq ($(GIT),) - SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \ - then git describe --always --dirty 2>/dev/null; \ - else git describe --always 2>/dev/null; fi) -endif - -ifeq ($(SCM_REV),) -ifneq ($(SVNVERSION),) - SCM_REV = r$(shell svnversion -n .) -endif -endif +#GIT = $(shell which git) +#SVNVERSION = $(shell which svnversion) +# +#ifneq ($(GIT),) +# SCM_REV = $(shell if git --help describe |grep dirty 2>&1 >/dev/null ; \ +# then git describe --always --dirty 2>/dev/null; \ +# else git describe --always 2>/dev/null; fi) +#endif +# +#ifeq ($(SCM_REV),) +#ifneq ($(SVNVERSION),) +# SCM_REV = r$(shell svnversion -n .) +#endif +#endif #version number VERSION = 1 PATCHLEVEL = 4 SUBLEVEL = 0 -ifneq ($(SCM_REV),) -EXTRAVERSION = -dev-$(SCM_REV) -endif +#ifneq ($(SCM_REV),) +#EXTRAVERSION = -dev-$(SCM_REV) +#endif REL_VERSION=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL) RELEASE=$(REL_VERSION)$(EXTRAVERSION)