diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-13 01:19:29 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-13 01:19:29 +0000 |
| commit | 3c5276ae98ad53e5bebc1ae66f4abb495a8a4bb0 (patch) | |
| tree | 5b63bc4801f5b92d8a97a03b6f10b0db9d9bbe4f /build_tools | |
| parent | a088778e55320843aa3961fa03e11b612c211113 (diff) | |
Use the correct branch integrated property when generating the version string.
Copied the make_version file from Asterisk trunk.
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@181898 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_version | 134 |
1 files changed, 65 insertions, 69 deletions
diff --git a/build_tools/make_version b/build_tools/make_version index e55727f40..e90932e65 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -1,83 +1,79 @@ #!/bin/sh if [ -f ${1}/.version ]; then - cat ${1}/.version + cat ${1}/.version elif [ -d .svn ]; then PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'` BRANCH=0 TEAM=0 TAG=0 - + REV=`svnversion -c ${1} | cut -d: -f2` - BASE=`LANG=C svn pg svnmerge-integrated ${1} | cut -d: -f1` - - if [ "${PARTS}" = "trunk" ] - then - echo SVN-trunk-r${REV} - exit 0 + 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 + echo SVN-trunk-r${REV} + exit 0 fi - - for PART in $PARTS - 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 ] - then - if [ -z ${RESULT} ] - then - RESULT="${PART}" - else - RESULT="${RESULT}-${PART}" - fi - break - fi - - if [ ${TEAM} != 0 ] - then - if [ -z ${RESULT} ] - then - RESULT="${PART}" - else - RESULT="${RESULT}-${PART}" - fi - continue - fi - - if [ "${PART}" = "branches" ] - then - BRANCH=1 - RESULT="branch" - continue - fi - - if [ "${PART}" = "tags" ] - then - TAG=1 - continue - fi - - if [ "${PART}" = "team" ] - then - TEAM=1 - continue - fi + + for PART in $PARTS ; 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 ] ; then + if [ -z "${RESULT}" ] ; then + RESULT="${PART}" + else + RESULT="${RESULT}-${PART}" + fi + break + fi + + if [ ${TEAM} != 0 ] ; then + if [ -z "${RESULT}" ] ; then + RESULT="${PART}" + else + RESULT="${RESULT}-${PART}" + fi + continue + fi + + if [ "${PART}" = "branches" ] ; then + BRANCH=1 + RESULT="branch" + continue + fi + + if [ "${PART}" = "tags" ] ; then + TAG=1 + continue + fi + + if [ "${PART}" = "team" ] ; then + TEAM=1 + continue + fi done - - if [ ${TAG} != 0 ] - then - echo ${RESULT} - else - echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} + + if [ ${TAG} != 0 ] ; then + echo ${RESULT} + else + echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}} fi +else + echo "UNKNOWN__and_probably_unsupported" fi |