diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-21 14:02:26 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-21 14:02:26 +0000 |
commit | 254c4e53b2abb83aaf532342a7f51fb561826507 (patch) | |
tree | c64c0141c3d165f8acbafa97198dad29cf4b7ffb | |
parent | 9e2ec942aca54fb485136946caa845573f5c7b91 (diff) |
Merged revisions 2195 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.4
................
r2195 | kpfleming | 2007-02-21 08:00:59 -0600 (Wed, 21 Feb 2007) | 10 lines
Merged revisions 2194 via svnmerge from
https://origsvn.digium.com/svn/zaptel/branches/1.2
........
r2194 | kpfleming | 2007-02-21 08:00:20 -0600 (Wed, 21 Feb 2007) | 2 lines
use new tag version numbering script
........
................
git-svn-id: http://svn.digium.com/svn/zaptel/trunk@2197 5390a7c7-147a-4af0-8ec9-7488f05a26cb
-rwxr-xr-x | build_tools/make_svn_branch_name | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name index 1fe7507..b4b712d 100755 --- a/build_tools/make_svn_branch_name +++ b/build_tools/make_svn_branch_name @@ -3,6 +3,7 @@ PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/:: | sed -e 's:/: :g'` BRANCH=0 TEAM=0 +TAG=0 REV=`svnversion -c . | cut -d: -f2` @@ -14,6 +15,12 @@ fi for PART in $PARTS do + if [ ${TAG} != 0 ] + then + RESULT="${PART}" + break + fi + if [ ${BRANCH} != 0 ] then RESULT="${RESULT}-${PART}" @@ -35,8 +42,7 @@ do if [ "${PART}" = "tags" ] then - BRANCH=1 - RESULT="tag" + TAG=1 continue fi @@ -47,4 +53,9 @@ do fi done -echo ${RESULT##-}-r${REV} +if [ ${TAG} != 0 ] +then + echo ${RESULT} +else + echo ${RESULT##-}-r${REV} +fi |