FGCOM/libpri
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the correct branch integrated property when generating the version string.

Browse Source 
Update the make_version file to the latest Asterisk version with the
appropriate libpri required chage.


git-svn-id: https://origsvn.digium.com/svn/libpri/branches/1.4@705 2fbb986a-6c06-0410-b554-c9c1f0a7f128
This commit is contained in:
Richard Mudgett 2009-03-13 01:05:54 +00:00
parent 48fc219865
commit bbaeec9513
1 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build_tools/make_version
View File

@ -10,7 +10,12 @@ elif [ -d .svn ]; then
REV=`svnversion -c ${1} | cut -d: -f2` REV=`svnversion -c ${1} | cut -d: -f2`
BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1` INTEGRATED=`LANG=C svn pg automerge-propname ${1}`
if [ -z "${INTEGRATED}" ] ; then
INTEGRATED=svnmerge-integrated
fi
BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
if [ "${PARTS}" = "trunk" ] ; then if [ "${PARTS}" = "trunk" ] ; then
echo SVN-trunk-r${REV} echo SVN-trunk-r${REV}
@ -30,7 +35,7 @@ elif [ -d .svn ]; then
fi fi
if [ ${BRANCH} != 0 ] ; then if [ ${BRANCH} != 0 ] ; then
if [ -z ${RESULT} ] ; then if [ -z "${RESULT}" ] ; then
RESULT="${PART}" RESULT="${PART}"
else else
RESULT="${RESULT}-${PART}" RESULT="${RESULT}-${PART}"
@ -39,7 +44,7 @@ elif [ -d .svn ]; then
fi fi
if [ ${TEAM} != 0 ] ; then if [ ${TEAM} != 0 ] ; then
if [ -z ${RESULT} ] ; then if [ -z "${RESULT}" ] ; then
RESULT="${PART}" RESULT="${PART}"
else else
RESULT="${RESULT}-${PART}" RESULT="${RESULT}-${PART}"
@ -69,4 +74,6 @@ elif [ -d .svn ]; then
else else
echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
fi fi
else
echo "UNKNOWN__and_probably_unsupported"
fi fi