X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=774e514c22fcba06e209e979e6ed2a2435d1aae8;hb=8f8320d7c32c375e86712aa406465c30a27eb8d3;hp=121a8d33007b7173c99b3b6734a8a2a96a114610;hpb=9e6165b53eeef2932f2fd13a46c1b636719f7825;p=ffmpeg

diff --git a/version.sh b/version.sh
index 121a8d33007..774e514c22f 100755
--- a/version.sh
+++ b/version.sh
@@ -1,22 +1,38 @@
 #!/bin/sh
 
 # check for SVN revision number
-revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $revision || revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $revision || revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
+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
 if ! test $revision; then
-    revision=`cd "$1" && git log -1 --pretty=format:%h`
+    revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
     test $revision && revision=git-$revision
 fi
 
-# no version number found
+# no revision number found
 test $revision || revision=UNKNOWN
 
-NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
-OLD_REVISION=`cat version.h 2> /dev/null`
+# releases extract the version number from the VERSION file
+version=$(cd "$1" && cat VERSION 2> /dev/null)
+test $version || version=$revision
+
+test -n "$3" && version=$version-$3
+
+NEW_REVISION="#define FFMPEG_VERSION \"$version\""
+OLD_REVISION=$(cat version.h 2> /dev/null)
 
 # Update version.h only on revision changes to avoid spurious rebuilds
 if test "$NEW_REVISION" != "$OLD_REVISION"; then