[asterisk-commits] mjordan: branch certified-1.8.6 r368607 - in /certified/branches/1.8.6: ./ bu...

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jun  6 12:28:14 2012
New Revision: 368607

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=368607
Log:
Add feature modifier to versions produced from branches

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


Modified:
    certified/branches/1.8.6/   (props changed)
    certified/branches/1.8.6/build_tools/make_version
    certified/branches/1.8.6/cel/cel_odbc.c   (props changed)
    certified/branches/1.8.6/configs/cel_odbc.conf.sample   (props changed)
    certified/branches/1.8.6/contrib/realtime/mysql/iaxfriends.sql   (props changed)
    certified/branches/1.8.6/contrib/realtime/mysql/meetme.sql   (props changed)
    certified/branches/1.8.6/contrib/realtime/mysql/sipfriends.sql   (props changed)
    certified/branches/1.8.6/contrib/realtime/mysql/voicemail.sql   (props changed)
    certified/branches/1.8.6/contrib/realtime/postgresql/realtime.sql   (props changed)
    certified/branches/1.8.6/sounds/Makefile   (props changed)

Propchange: certified/branches/1.8.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,1 +1,2 @@
 /be/branches/C.3:256426
+/branches/1.8:368604

Modified: certified/branches/1.8.6/build_tools/make_version
URL: http://svnview.digium.com/svn/asterisk/certified/branches/1.8.6/build_tools/make_version?view=diff&rev=368607&r1=368606&r2=368607
==============================================================================
--- certified/branches/1.8.6/build_tools/make_version (original)
+++ certified/branches/1.8.6/build_tools/make_version Wed Jun  6 12:28:14 2012
@@ -7,6 +7,7 @@
     BRANCH=0
     TEAM=0
     TAG=0
+    FEATURE=0
 
     REV=`svnversion -c ${1} | cut -d: -f2`
 
@@ -40,6 +41,9 @@
             else
                 RESULT="${RESULT}-${PART}"
             fi
+            if [ ${FEATURE} != 0 ] ; then
+                RESULT="${RESULT}-${FEATURE_NAME}"
+            fi
             break
         fi
 
@@ -49,6 +53,12 @@
             else
                 RESULT="${RESULT}-${PART}"
             fi
+            continue
+        fi
+
+        if [ "${PART}" = "certified" ] ; then
+            FEATURE=1
+            FEATURE_NAME="cert"
             continue
         fi
 

Propchange: certified/branches/1.8.6/cel/cel_odbc.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,1 +1,2 @@
 /be/branches/C.3/cel/cel_adaptive_odbc.c:256426
+/branches/1.8/cel/cel_odbc.c:368604

Propchange: certified/branches/1.8.6/configs/cel_odbc.conf.sample
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,1 +1,2 @@
 /be/branches/C.3/configs/cel_adaptive_odbc.conf.sample:256426
+/branches/1.8/configs/cel_odbc.conf.sample:368604

Propchange: certified/branches/1.8.6/contrib/realtime/mysql/iaxfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,0 +1,1 @@
+/branches/1.8/contrib/realtime/mysql/iaxfriends.sql:368604

Propchange: certified/branches/1.8.6/contrib/realtime/mysql/meetme.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,0 +1,1 @@
+/branches/1.8/contrib/realtime/mysql/meetme.sql:368604

Propchange: certified/branches/1.8.6/contrib/realtime/mysql/sipfriends.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,0 +1,1 @@
+/branches/1.8/contrib/realtime/mysql/sipfriends.sql:368604

Propchange: certified/branches/1.8.6/contrib/realtime/mysql/voicemail.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,0 +1,1 @@
+/branches/1.8/contrib/realtime/mysql/voicemail.sql:368604

Propchange: certified/branches/1.8.6/contrib/realtime/postgresql/realtime.sql
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,0 +1,1 @@
+/branches/1.8/contrib/realtime/postgresql/realtime.sql:368604

Propchange: certified/branches/1.8.6/sounds/Makefile
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun  6 12:28:14 2012
@@ -1,2 +1,3 @@
 /be/branches/C.3/sounds/Makefile:256426
+/branches/1.8/sounds/Makefile:368604
 /trunk/sounds/Makefile:270974