[svn-commits] sruffell: branch linux/2.4 r9757 - in /linux/branches/2.4: ./ build_tools/

[SVN commits to the Digium repositories]

Author: sruffell
Date: Fri Feb 11 11:51:54 2011
New Revision: 9757

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9757
Log:
dahdi: Generate include/dahdi/version.h when building in a git repository.

If building within a git repository search the last log message for a
'git-svn-id'.  If found, the commit has a corresponding svn revision
number and we will use the SVN-xxx-rxxx revision form. Otherwise use the
output of 'git describe --long --always --tags --dirty=M' as the
version.

Signed-off-by: Shaun Ruffell <sruffell at digium.com>
Acked-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>

Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9396

Modified:
    linux/branches/2.4/Makefile
    linux/branches/2.4/build_tools/make_version

Modified: linux/branches/2.4/Makefile
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/Makefile?view=diff&rev=9757&r1=9756&r2=9757
==============================================================================
--- linux/branches/2.4/Makefile (original)
+++ linux/branches/2.4/Makefile Fri Feb 11 11:51:54 2011
@@ -69,6 +69,10 @@
 else
 ifneq ($(wildcard .svn),)
   DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
+else
+ifneq ($(wildcard .git),)
+  DAHDIVERSION:=$(shell build_tools/make_version . dahdi/linux)
+endif
 endif
 endif
 

Modified: linux/branches/2.4/build_tools/make_version
URL: http://svnview.digium.com/svn/dahdi/linux/branches/2.4/build_tools/make_version?view=diff&rev=9757&r1=9756&r2=9757
==============================================================================
--- linux/branches/2.4/build_tools/make_version (original)
+++ linux/branches/2.4/build_tools/make_version Fri Feb 11 11:51:54 2011
@@ -53,4 +53,66 @@
     done
     
     echo SVN-${RESULT##-}-r${REV}
+elif [ -d .git ]; then
+    # If the first log commit messages indicates that this is checked into
+    # subversion, we'll just use the SVN- form of the revision.
+    MODIFIED=""
+    SVN_REV=`git log --pretty=full -1 | grep -F "git-svn-id:" | sed -e "s/.*\@\([^\s]*\)\s.*/\1/g"`
+    if [ -z "$SVN_REV" ]; then
+        VERSION=`git describe --long --always --tags --dirty=M 2> /dev/null`
+        if [[ $? -ne 0 ]]; then
+            if [[ "`git ls-files -m | wc -l`" != "0" ]]; then
+                MODIFIED="M"
+            fi
+            # Some older versions of git do not support all the above
+            # options.
+            VERSION=GIT-`git log --abbrev-commit -1 --pretty=oneline --abbrev=7 | cut -f 1 -d .`${MODIFIED}
+        fi
+        echo ${VERSION}
+    else
+        PARTS=`LANG=C git log --pretty=full | grep -F "git-svn-id:" | head -1 | awk '{print $2;}' | sed -e s:^.*/svn/$2/:: | sed -e 's:/: :g' | sed -e 's/@.*$//g'`
+        BRANCH=0
+        TEAM=0
+
+        if [[ "`git ls-files -m | wc -l`" != "0" ]]; then
+            MODIFIED="M"
+        fi
+
+        if [ "${PARTS}" = "trunk" ]; then
+            echo SVN-'trunk'-r${SVN_REV}${MODIFIED}
+            exit 0
+        fi
+
+        for PART in $PARTS
+          do
+              if [ ${BRANCH} != 0 ]; then
+              RESULT="${RESULT}-${PART}"
+              break
+          fi
+
+          if [ ${TEAM} != 0 ]; then
+              RESULT="${RESULT}-${PART}"
+              continue
+          fi
+
+          if [ "${PART}" = "branches" ]; then
+              BRANCH=1
+              RESULT="branch"
+              continue
+          fi
+
+          if [ "${PART}" = "tags" ]; then
+              BRANCH=1
+              RESULT="tag"
+              continue
+          fi
+
+          if [ "${PART}" = "team" ]; then
+              TEAM=1
+              continue
+          fi
+        done
+
+        echo SVN-${RESULT##-}-r${SVN_REV}${MODIFIED}
+    fi
 fi