[asterisk-commits] branch 1.2 - commit revision 7208

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Nov 27 22:01:06 2005
New Revision: 7208

URL: http://svn.digium.com/view/asterisk?rev=7208&view=rev
Log:
port version string computation from trunk

Added:
    branches/1.2/build_tools/make_svn_branch_name   (props changed)
      - copied unchanged from r7207, trunk/build_tools/make_svn_branch_name
Modified:
    branches/1.2/Makefile

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/Makefile?rev=7208&r1=7207&r2=7208&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Nov 27 22:01:06 2005
@@ -305,22 +305,26 @@
 LIBEDIT=editline/libedit.a
 
 ifneq ($(wildcard .version),)
-  ASTERISKVERSION=$(shell cat .version)
-  ASTERISKVERSIONNUM=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
-  RPMVERSION=$(shell sed 's/[-\/:]/_/g' .version)
+  ASTERISKVERSION:=$(shell cat .version)
+  ASTERISKVERSIONNUM:=$(shell awk -F. '{printf "%02d%02d%02d", $$1, $$2, $$3}' .version)
+  RPMVERSION:=$(shell sed 's/[-\/:]/_/g' .version)
 else
   RPMVERSION=unknown
 endif
 
-ifneq ($(wildcard CVS),)
+# CVS mirrors of SVN have .svnrevision files showing
+# which SVN revision they are based on, and .svnbranch
+# showing the branch they are made from
+ifneq ($(wildcard .svnrevision),)
   ASTERISKVERSIONNUM=999999
-  ifneq ($(wildcard CVS/Tag),)
-    ASTERISKVERSION=$(shell echo "CVS-`sed 's/^T//g' CVS/Tag`-`date +"%D-%T"`")
+  ASTERISKVERSION:=SVN-$(shell cat .svnbranch)-r$(shell cat .svnrevision)
+else
+  ifneq ($(wildcard .svn),)
+    ASTERISKVERSIONNUM=999999
+    ASTERISKVERSION=SVN-$(shell build_tools/make_svn_branch_name)
   else
-    ASTERISKVERSION=CVS HEAD
+    ASTERISKVERSIONNUM=000000
   endif
-else
-  ASTERISKVERSIONNUM=000000
 endif
 
 ASTCFLAGS+= $(DEBUG_THREADS)

Propchange: branches/1.2/build_tools/make_svn_branch_name
------------------------------------------------------------------------------
    svn:executable = *