diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-23 15:29:19 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-05-23 15:29:19 +0000 |
| commit | 56e62e55f3d7adaf434b5dc90be323a0ec2b56c1 (patch) | |
| tree | 70cc27b35bf411a573bd815233dd84ebdac02786 /build_tools | |
| parent | f93386feb19cc26c0e10ba9208afaba7a790ee5c (diff) | |
get version string built correctly, fix some minor bugs in the configure script
git-svn-id: http://svn.asterisk.org/svn/dahdi/tools/trunk@4342 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'build_tools')
| -rwxr-xr-x | build_tools/make_svn_branch_name | 61 | ||||
| -rwxr-xr-x | build_tools/make_version | 2 |
2 files changed, 1 insertions, 62 deletions
diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name deleted file mode 100755 index b4b712d..0000000 --- a/build_tools/make_svn_branch_name +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh - -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` - -if [ "${PARTS}" = "trunk" ] -then - echo 'trunk'-r${REV} - exit 0 -fi - -for PART in $PARTS -do - if [ ${TAG} != 0 ] - then - RESULT="${PART}" - break - fi - - if [ ${BRANCH} != 0 ] - then - RESULT="${RESULT}-${PART}" - break - fi - - if [ ${TEAM} != 0 ] - then - RESULT="${RESULT}-${PART}" - 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 ${RESULT##-}-r${REV} -fi diff --git a/build_tools/make_version b/build_tools/make_version index d710ffa..e6caaa2 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -5,7 +5,7 @@ if [ -f ${1}/.version ]; then elif [ -f ${1}/.svnrevision ]; then echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision` elif [ -d .svn ]; then - PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/zaptel/:: | sed -e 's:/: :g'` + PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'` BRANCH=0 TEAM=0 |