Add feature modifier to versions produced from branches
authorMatthew Jordan <mjordan@digium.com>
Wed, 6 Jun 2012 17:22:11 +0000 (17:22 +0000)
committerMatthew Jordan <mjordan@digium.com>
Wed, 6 Jun 2012 17:22:11 +0000 (17:22 +0000)
Certain branches, such as Certified Asterisk, may have a modifier added to
them that specifies the features available in that branch.  For branches, this
modifier is expected to be reflected in the location of the branch in
subversion. For example, a subversion of URL of /certified/branches/1.8.11
would have a feature modifier of 'certified'.  This is slightly different then
how features are determined for tags, where the feature is part of the actual
tag name, e.g., "10.5.0-digiumphones".

In keeping with the nomenclature used for tags, the feature specifier for
branches is translated and placed after the revision numbers.  For the example
given previously, this would result in a branch version of
"Asterisk SVN-branch-1.8.11-cert-rXXXXXX".
........

Merged revisions 368604 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 368605 from http://svn.asterisk.org/svn/asterisk/branches/10

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@368606 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/make_version

index e90932e..d81325f 100755 (executable)
@@ -7,6 +7,7 @@ elif [ -d .svn ]; then
     BRANCH=0
     TEAM=0
     TAG=0
     BRANCH=0
     TEAM=0
     TAG=0
+    FEATURE=0
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
@@ -40,6 +41,9 @@ elif [ -d .svn ]; then
             else
                 RESULT="${RESULT}-${PART}"
             fi
             else
                 RESULT="${RESULT}-${PART}"
             fi
+            if [ ${FEATURE} != 0 ] ; then
+                RESULT="${RESULT}-${FEATURE_NAME}"
+            fi
             break
         fi
 
             break
         fi
 
@@ -52,6 +56,12 @@ elif [ -d .svn ]; then
             continue
         fi
 
             continue
         fi
 
+        if [ "${PART}" = "certified" ] ; then
+            FEATURE=1
+            FEATURE_NAME="cert"
+            continue
+        fi
+
         if [ "${PART}" = "branches" ] ; then
             BRANCH=1
             RESULT="branch"
         if [ "${PART}" = "branches" ] ; then
             BRANCH=1
             RESULT="branch"