[FFmpeg-cvslog] Use the contents of RELEASE as version fallback instead of 'UNKNOWN'

Reinhard Tartler git at videolan.org
Mon Jun 20 04:10:27 CEST 2011


ffmpeg | branch: master | Reinhard Tartler <siretart at tauware.de> | Sun Jun 19 19:51:20 2011 +0200| [8fab4007c83349e5dbaacca735ce698cf94bf8e4] | committer: Reinhard Tartler

Use the contents of RELEASE as version fallback instead of 'UNKNOWN'

This makes binaries produced by source tarballs identify themselves with
the version number of the corresponding release series, unless overriden
by a 'VERSION' file.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8fab4007c83349e5dbaacca735ce698cf94bf8e4
---

 RELEASE    |    1 +
 version.sh |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/RELEASE b/RELEASE
new file mode 100644
index 0000000..eb49d7c
--- /dev/null
+++ b/RELEASE
@@ -0,0 +1 @@
+0.7
diff --git a/version.sh b/version.sh
index 6ec2b25..7911e46 100755
--- a/version.sh
+++ b/version.sh
@@ -5,7 +5,7 @@ revision=$(cd "$1" && git describe --always 2> /dev/null)
 test "$revision" && revision=git-$revision
 
 # no revision number found
-test "$revision" || revision=UNKNOWN
+test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
 
 # releases extract the version number from the VERSION file
 version=$(cd "$1" && cat VERSION 2> /dev/null)



More information about the ffmpeg-cvslog mailing list