From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 13 Mar 2009 01:19:29 +0000 (+0000)
Subject: Use the correct branch integrated property when generating the version string.
X-Git-Tag: 1.4.25-rc1~136
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00c1a47c886cc53fd1e12046b10d7e73fdfd1838;p=thirdparty%2Fasterisk.git

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
---

diff --git a/build_tools/make_version b/build_tools/make_version
index e55727f403..e90932e65d 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