[zaptel-commits] kpfleming: branch 1.2 r2194 - /branches/1.2/build_tools/make_svn_branch_name

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Feb 21 08:00:20 2007
New Revision: 2194

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2194
Log:
use new tag version numbering script

Modified:
    branches/1.2/build_tools/make_svn_branch_name

Modified: branches/1.2/build_tools/make_svn_branch_name
URL: http://svn.digium.com/view/zaptel/branches/1.2/build_tools/make_svn_branch_name?view=diff&rev=2194&r1=2193&r2=2194
==============================================================================
--- branches/1.2/build_tools/make_svn_branch_name (original)
+++ branches/1.2/build_tools/make_svn_branch_name Wed Feb 21 08:00:20 2007
@@ -4,6 +4,7 @@
 BETA=0
 BRANCH=0
 TEAM=0
+TAG=0
 
 REV=`svnversion -c . | cut -d: -f2`
 
@@ -18,6 +19,12 @@
   if [ ${BETA} != 0 ]
   then
       RESULT="${RESULT}-${PART}"
+      break
+  fi
+
+  if [ ${TAG} != 0 ]
+  then
+      RESULT="${PART}"
       break
   fi
 
@@ -49,8 +56,7 @@
 
   if [ "${PART}" = "tags" ]
   then
-      BRANCH=1
-      RESULT="tag"
+      TAG=1
       continue
   fi
 
@@ -61,4 +67,9 @@
   fi
 done
 
-echo ${RESULT##-}-r${REV}
+if [ ${TAG} != 0 ]
+then
+    echo ${RESULT}
+else
+    echo ${RESULT##-}-r${REV}
+fi