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

Copied the make_version file from Asterisk trunk.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@181898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2009-03-13 01:19:29 +00:00
parent 8dbfea83ce
commit 00c1a47c88

View File

@@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
if [ -f ${1}/.version ]; then if [ -f ${1}/.version ]; then
cat ${1}/.version cat ${1}/.version
elif [ -d .svn ]; then elif [ -d .svn ]; then
PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'` PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0 BRANCH=0
@@ -10,74 +10,70 @@ 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
if [ "${PARTS}" = "trunk" ] INTEGRATED=svnmerge-integrated
then
echo SVN-trunk-r${REV}
exit 0
fi fi
for PART in $PARTS BASE=`LANG=C svn pg ${INTEGRATED} ${1} | cut -d: -f1`
do
if [ ${TAG} != 0 ]
then
if [ "${PART}" = "autotag_for_be" ] ; then
continue
fi
if [ "${PART}" = "autotag_for_sx00i" ] ; then
continue
fi
RESULT="${PART}"
break
fi
if [ ${BRANCH} != 0 ] if [ "${PARTS}" = "trunk" ] ; then
then echo SVN-trunk-r${REV}
if [ -z ${RESULT} ] exit 0
then fi
RESULT="${PART}"
else
RESULT="${RESULT}-${PART}"
fi
break
fi
if [ ${TEAM} != 0 ] for PART in $PARTS ; do
then if [ ${TAG} != 0 ] ; then
if [ -z ${RESULT} ] if [ "${PART}" = "autotag_for_be" ] ; then
then continue
RESULT="${PART}" fi
else if [ "${PART}" = "autotag_for_sx00i" ] ; then
RESULT="${RESULT}-${PART}" continue
fi fi
continue RESULT="${PART}"
fi break
fi
if [ "${PART}" = "branches" ] if [ ${BRANCH} != 0 ] ; then
then if [ -z "${RESULT}" ] ; then
BRANCH=1 RESULT="${PART}"
RESULT="branch" else
continue RESULT="${RESULT}-${PART}"
fi fi
break
fi
if [ "${PART}" = "tags" ] if [ ${TEAM} != 0 ] ; then
then if [ -z "${RESULT}" ] ; then
TAG=1 RESULT="${PART}"
continue else
fi RESULT="${RESULT}-${PART}"
fi
continue
fi
if [ "${PART}" = "team" ] if [ "${PART}" = "branches" ] ; then
then BRANCH=1
TEAM=1 RESULT="branch"
continue continue
fi fi
if [ "${PART}" = "tags" ] ; then
TAG=1
continue
fi
if [ "${PART}" = "team" ] ; then
TEAM=1
continue
fi
done done
if [ ${TAG} != 0 ] if [ ${TAG} != 0 ] ; then
then echo ${RESULT}
echo ${RESULT} 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