[PATCH] remove svn and git-svn version genration from version.sh

Janne Grunau janne-ffmpeg
Tue Jan 18 15:52:42 CET 2011


Signed-off-by: Janne Grunau <janne-ffmpeg at jannau.net>
---
 version.sh |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/version.sh b/version.sh
index f45c60d..31e0f6e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,26 +1,11 @@
 #!/bin/sh
 
-# check for SVN revision number
-revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
-test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
-test $revision || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2)
-test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n
-p
-q
-}' .svn/entries 2>/dev/null)
-test $revision && revision=SVN-r$revision
-
-# check for git svn revision number
-if ! test $revision; then
-    revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
-    test $revision && revision=git-svn-r$revision
-fi
-
 # check for git short hash
+revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
 if ! test $revision; then
     revision=$(cd "$1" && git describe --always 2> /dev/null)
-    test $revision && revision=git-$revision
 fi
+test $revision && revision=git-$revision
 
 # no revision number found
 test $revision || revision=UNKNOWN
-- 
1.7.4.rc2


--G4iJoqBmSsgzjUCe--



More information about the ffmpeg-devel mailing list