[dss-commits] digitalSTROM Server branch, master, updated. 4d893749b1503dc6e2a8b944901287d3c76f0887

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM Server".

The branch, master has been updated
       via  4d893749b1503dc6e2a8b944901287d3c76f0887 (commit)
      from  533f48f7f0eb0cd344867b18a7419cc5eb133134 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 4d893749b1503dc6e2a8b944901287d3c76f0887
Author: Johannes Winkelmann <johannes.winkelmann at aizo.com>
Date:   Mon Nov 16 16:15:38 2009 +0100

    cleanup dss_gen_version_unix.sh
    
    Remove support for svn/hg from dss_gen_version_unix.sh, and make it use
    .dss_git_version and .dss_git_branch if no .git directory is found
    
    Closes #218

-----------------------------------------------------------------------

Changes:
diff --git a/tools/dss_gen_version_unix.sh b/tools/dss_gen_version_unix.sh
index d6d1004..1aa11c6 100755
--- a/tools/dss_gen_version_unix.sh
+++ b/tools/dss_gen_version_unix.sh
@@ -14,26 +14,23 @@ if [ -z "$TARGETDIR" ] ; then
   exit 1
 fi
 
-rcs_rev="REV_UNDEFINED"
-rcs_root="URL_UNDEFINED"
-if [ -d $BASEDIR/.svn ]; then
-  rcs_rev=$(svnversion $BASEDIR)
-  rcs_root=$(svn info $BASEDIR|grep ^URL:|sed -e 's|URL:\s*||')
-elif [ -d $BASEDIR/.git ]; then
-  if [ -d $BASEDIR/.git/svn ]; then
-    rcs_rev=svn-$(git svn info|grep ^Revision:| sed -e 's|Revision:\s*||')+
-    rcs_root=$(git svn info|grep ^URL:|sed -e 's|URL:\s*||')    
-  else
-    rcs_root=$(git branch|grep ^*)
-  fi
-  rcs_rev="${rcs_rev}git:$(git rev-parse HEAD)"
+rcs_rev="-"
+rcs_root="-"
+if [ -d $BASEDIR/.git ]; then
+  rcs_rev="git:$(git rev-parse HEAD)"
+  rcs_root=$(git branch|grep ^*|sed -e 's|^\*\s*||')
+  
   rcs_st=$(git status $BASEDIR|grep modified:)
   if [ -n "$rcs_st" ]; then
     rcs_rev="$rcs_rev-dirty"
   fi
-elif [ -d $BASEDIR/.hg ]; then
-  rcs_rev=$(hg identify) # already contains the '+' marked when modified
-  rcs_root=$(hg branch)
+else
+  if [ -f $BASEDIR/.dss_git_version ]; then
+    rcs_rev=$(cat $BASEDIR/.dss_git_version)
+  fi
+  if [ -f $BASEDIR/.dss_git_branch ]; then
+    rcs_root=$(cat $BASEDIR/.dss_git_branch)
+  fi
 fi
 
 


hooks/post-receive
-- 
digitalSTROM Server