X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=3269e038a7ae0bbe4e9f55393109b44786af37ba;hb=d2bbf82e65e4a128ab1f0bf48df5d1e43c43c698;hp=e4abf7200d214366d0f5604b01dce6eca5541379;hpb=7a68f7fa22861be70e983db01dad9960a762031a;p=ffmpeg

diff --git a/version.sh b/version.sh
index e4abf7200d2..3269e038a7a 100755
--- a/version.sh
+++ b/version.sh
@@ -1,14 +1,45 @@
 #!/bin/sh
 
-svn_revision=`cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2`
-test $svn_revision || svn_revision=`cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2`
-test $svn_revision || svn_revision=`cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null`
-test $svn_revision || svn_revision=UNKNOWN
+# 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
 
-NEW_REVISION="#define FFMPEG_VERSION \"SVN-r$svn_revision\""
-OLD_REVISION=`cat version.h 2> /dev/null`
+# 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 describe --always 2> /dev/null)
+    test "$revision" && revision=git-$revision
+fi
+
+# no revision number found
+test "$revision" || revision=UNKNOWN
+
+# 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
+
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
+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
-    echo "$NEW_REVISION" > version.h
+    echo "$NEW_REVISION" > "$2"
 fi