diff options
author | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-21 14:00:59 +0000 |
---|---|---|
committer | kpfleming <kpfleming@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2007-02-21 14:00:59 +0000 |
commit | fdd8ac246e0105fc0c0925a2f0bd5633cd1a773c (patch) | |
tree | 6a5b2ed6fc57b755f3dca7cbf2ea4a84bb551d6a /build_tools | |
parent | 444e0f8b8694fed93f4f86efe461841e9cdfc96b (diff) |
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/branches/1.4@2195 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'build_tools')
-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 |