From bf3c67c2d28a032eaa8e4bb3868a010a8387ad74 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 21 Feb 2007 14:07:43 +0000
Subject: [PATCH] Merged revisions 55869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r55869 | kpfleming | 2007-02-21 08:06:47 -0600 (Wed, 21 Feb 2007) | 10 lines
Merged revisions 55868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r55868 | kpfleming | 2007-02-21 08:03:11 -0600 (Wed, 21 Feb 2007) | 2 lines
use new tag version script
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@55870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
build_tools/make_version | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/build_tools/make_version b/build_tools/make_version
index 2a4021c8bd..6176de2c0b 100755
--- a/build_tools/make_version
+++ b/build_tools/make_version
@@ -2,12 +2,11 @@
if [ -f ${1}/.version ]; then
cat ${1}/.version
-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/asterisk/::' | sed -e 's:/: :g'`
BRANCH=0
TEAM=0
+ TAG=0
REV=`svnversion -c ${1} | cut -d: -f2`
@@ -19,6 +18,12 @@ elif [ -d .svn ]; then
for PART in $PARTS
do
+ if [ ${TAG} != 0 ]
+ then
+ RESULT="${PART}"
+ break
+ fi
+
if [ ${BRANCH} != 0 ]
then
RESULT="${RESULT}-${PART}"
@@ -40,8 +45,7 @@ elif [ -d .svn ]; then
if [ "${PART}" = "tags" ]
then
- BRANCH=1
- RESULT="tag"
+ TAG=1
continue
fi
@@ -52,5 +56,10 @@ elif [ -d .svn ]; then
fi
done
- echo SVN-${RESULT##-}-r${REV}
+ if [ ${TAG} != 0 ]
+ then
+ echo ${RESULT}
+ else
+ echo SVN-${RESULT##-}-r${REV}
+ fi
fi
--
GitLab