diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-28 04:01:06 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-11-28 04:01:06 +0000 |
commit | 95dda5bc53c1e5ad4fca59defa6a3e5730a8cbd8 (patch) | |
tree | 78e85a049e1bf895001d6e37ce2b722c1eeeca82 | |
parent | 83b477c9d4516932cde1e294e8805710e7af3cc1 (diff) |
port version string computation from trunk
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7208 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 22 | ||||
-rwxr-xr-x | build_tools/make_svn_branch_name | 50 |
2 files changed, 63 insertions, 9 deletions
@@ -305,22 +305,26 @@ endif # WITHOUT_ZAPTEL 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) diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name new file mode 100755 index 000000000..e24ba44cc --- /dev/null +++ b/build_tools/make_svn_branch_name @@ -0,0 +1,50 @@ +#!/bin/sh + +PARTS=`svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :'` +BRANCH=0 +TEAM=0 + +REV=`svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'` + +if [ "${PARTS}" == "trunk" ] +then + echo 'trunk'-r${REV} + exit 0 +fi + +for PART in $PARTS +do + if [ ${BRANCH} != 0 ] + then + RESULT="${RESULT}-${PART}" + break + fi + + if [ ${TEAM} != 0 ] + then + RESULT="${RESULT}-${PART}" + continue + fi + + if [ "${PART}" == "branches" ] + then + BRANCH=1 + RESULT="branch" + continue + fi + + if [ "${PART}" == "tags" ] + then + BRANCH=1 + RESULT="tag" + continue + fi + + if [ "${PART}" == "team" ] + then + TEAM=1 + continue + fi +done + +echo ${RESULT}-r${REV} |