Module: sems Branch: 1.4 Commit: fe44db34756ced68c4a7318344cba0c0a97807f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=fe44db34756ced68c4a7318344cba0c0a97807f9
Author: Stefan Sayer <[email protected]> Committer: Stefan Sayer <[email protected]> Date: Tue Mar 15 13:38:40 2011 +0100 set 1.4.1-dev-SCM version --- Makefile.defs | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 7c0246b..1b1807a 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 +SUBLEVEL = 1 -#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) _______________________________________________ Semsdev mailing list [email protected] http://lists.iptel.org/mailman/listinfo/semsdev
