[svn-commits] rmudgett: mISDN/trunk r65 - in /mISDN/trunk: ./ build_tools/

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Mar 12 13:08:30 2009
New Revision: 65

URL: http://svn.digium.com/svn-view/thirdparty?view=rev&rev=65
Log:
Added Digium modification versioning and updated CHANGES.

Added:
    mISDN/trunk/build_tools/
    mISDN/trunk/build_tools/make_version   (with props)
Removed:
    mISDN/trunk/VERSION
Modified:
    mISDN/trunk/   (props changed)
    mISDN/trunk/CHANGES
    mISDN/trunk/Makefile

Propchange: mISDN/trunk/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Mar 12 13:08:30 2009
@@ -1,0 +1,1 @@
+VERSION

Modified: mISDN/trunk/CHANGES
URL: http://svn.digium.com/svn-view/thirdparty/mISDN/trunk/CHANGES?view=diff&rev=65&r1=64&r2=65
==============================================================================
--- mISDN/trunk/CHANGES (original)
+++ mISDN/trunk/CHANGES Thu Mar 12 13:08:30 2009
@@ -1,3 +1,23 @@
+------------------------------------------------------------------------------
+--- mISDN enhancements -------------------------------------------------------
+------------------------------------------------------------------------------
+
+mISDN has been modified by Digium, Inc. to greatly expand facility message
+support to allow:
+  * Enhanced COLP support for call diversion and transfer.
+  * CCBS/CCNR support.
+
+------------------------------------------------------------------------------
+Digium enhancement version 1.0.0 changes
+
+*  Added REGISTER message support for CCBS-T/CCNR-T.
+
+For additional information see the svn log.
+
+------------------------------------------------------------------------------
+------------------------------------------------------------------------------
+
+
 mISDN-1-1-2:
 	- added a workaround that fixes a kernel panic when bridging is done after already a few 
 	  voice frames where transceived on both legs (like when you transfer a call from SIP 2 ISDN)

Modified: mISDN/trunk/Makefile
URL: http://svn.digium.com/svn-view/thirdparty/mISDN/trunk/Makefile?view=diff&rev=65&r1=64&r2=65
==============================================================================
--- mISDN/trunk/Makefile (original)
+++ mISDN/trunk/Makefile Thu Mar 12 13:08:30 2009
@@ -3,6 +3,8 @@
 MAJOR=1
 MINOR=1
 SUBMINOR=8
+
+MODIFIER_VERSION:=Digium-$(shell build_tools/make_version . | sed -e "s/\//_/g")
 
 INSTALL_PREFIX := /
 export INSTALL_PREFIX
@@ -103,13 +105,14 @@
 	find . -iname ".*.d" -exec rm -rf {} \;
 	find . -iname "*.mod.c" -exec rm -rf {} \;
 	find . -iname "*.mod" -exec rm -rf {} \;
+	find . -iname "*.symvers" -exec rm -rf {} \;
 
 VERSION:
-	echo $(MAJOR)_$(MINOR)_$(SUBMINOR) > VERSION ; \
+	echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$(MODIFIER_VERSION) > VERSION
 
 snapshot: clean
 	DIR=mISDN-$$(date +"20%y_%m_%d") ; \
-	echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$$(date +"20%y_%m_%d" | sed -e "s/\//_/g") > VERSION ; \
+	echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$(MODIFIER_VERSION)-$$(date +"20%y_%m_%d" | sed -e "s/\//_/g") > VERSION ; \
 	mkdir -p /tmp/$$DIR ; \
 	cp -a * /tmp/$$DIR ; \
 	cd /tmp/; \
@@ -117,7 +120,7 @@
 
 release: clean
 	DIR=mISDN-$(MAJOR)_$(MINOR)_$(SUBMINOR) ; \
-	echo $(MAJOR)_$(MINOR)_$(SUBMINOR) > VERSION ; \
+	echo $(MAJOR)_$(MINOR)_$(SUBMINOR)-$(MODIFIER_VERSION) > VERSION ; \
 	mkdir -p /tmp/$$DIR ; \
 	cp -a * /tmp/$$DIR ; \
 	cd /tmp/; \

Added: mISDN/trunk/build_tools/make_version
URL: http://svn.digium.com/svn-view/thirdparty/mISDN/trunk/build_tools/make_version?view=auto&rev=65
==============================================================================
--- mISDN/trunk/build_tools/make_version (added)
+++ mISDN/trunk/build_tools/make_version Thu Mar 12 13:08:30 2009
@@ -1,0 +1,83 @@
+#!/bin/sh
+
+GREP=grep
+AWK=awk
+
+if [ -f ${1}/.version ]; then
+    cat ${1}/.version
+elif [ -d .svn ]; then
+    PARTS=`LANG=C svn info ${1} | ${GREP} URL | ${AWK} '{print $2;}' | sed -e 's:^.*/svn/thirdparty/mISDN/::' | sed -e 's:/: :g'`
+    BRANCH=0
+    TEAM=0
+    TAG=0
+
+    REV=`svnversion -c ${1} | cut -d: -f2`
+
+    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
+    done
+
+    if [ ${TAG} != 0 ] ; then
+        echo ${RESULT}
+    else
+        echo SVN-${RESULT}-r${REV}${BASE:+-${BASE}}
+    fi
+else
+# The version is UNKNOWN and probably unsupported.
+    echo "UNKNOWN"
+fi

Propchange: mISDN/trunk/build_tools/make_version
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: mISDN/trunk/build_tools/make_version
------------------------------------------------------------------------------
    svn:executable = *

Propchange: mISDN/trunk/build_tools/make_version
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: mISDN/trunk/build_tools/make_version
------------------------------------------------------------------------------
    svn:mime-type = text/plain