[prev in list] [next in list] [prev in thread] [next in thread] 

List:       semsdev
Subject:    [Semsdev] git:1.4: 1.4 branch build version
From:       Stefan Sayer <stefan.sayer () googlemail ! com>
Date:       2012-05-04 10:57:22
Message-ID: 20120504105722.CFCE9EF8074 () rimmer ! ryngle ! com
[Download RAW message or body]

Module: sems
Branch: 1.4
Commit: d3b4db4f9597ae987384b60d5311fc86fb1f33c5
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sems/?a=commit;h=d3b4db4f9597ae987384b60d5311fc86fb1f33c5


Author: Stefan Sayer <stefan.sayer@googlemail.com>
Committer: Stefan Sayer <stefan.sayer@googlemail.com>
Date:   Fri May  4 12:56:46 2012 +0200

1.4 branch build version

---

 Makefile.defs |   28 ++++++++++++++--------------
 1 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index 0d2ea58..9379c0f 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -3,20 +3,20 @@ 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

_______________________________________________
Semsdev mailing list
Semsdev@lists.iptel.org
http://lists.iptel.org/mailman/listinfo/semsdev


[prev in list] [next in list] [prev in thread] [next in thread]