sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged revisions 65541 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r65541 | kpfleming | 2007-05-22 16:25:41 -0400 (Tue, 22 May 2007) | 2 lines

when building a version string for a developer branch, include the base branch in the version string

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@65542 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming 2007-05-22 20:26:35 +00:00
parent 90d6885701
commit 80baf2a40f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_tools/make_version
View File

@ -9,6 +9,8 @@ elif [ -d .svn ]; then
TAG=0
REV=`svnversion -c ${1} | cut -d: -f2`
BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1`
if [ "${PARTS}" = "trunk" ]
then
@ -60,6 +62,6 @@ elif [ -d .svn ]; then
then
echo ${RESULT}
else
echo SVN-${RESULT##-}-r${REV}
echo SVN-${RESULT##-}-r${REV}${BASE:+-${BASE}}
fi
fi