summaryrefslogtreecommitdiff
authorReinhard Tartler <siretart@tauware.de>2011-06-19 17:51:20 (GMT)
committer Reinhard Tartler <siretart@tauware.de>2011-06-19 17:54:07 (GMT)
commit8fab4007c83349e5dbaacca735ce698cf94bf8e4 (patch)
tree75e325cc53d227e00d0dcbecb3bd0d14e2583793
parent7b2d219045330494a2391beb6571ee1b25fc422d (diff)
downloadffmpeg-8fab4007c83349e5dbaacca735ce698cf94bf8e4.zip
ffmpeg-8fab4007c83349e5dbaacca735ce698cf94bf8e4.tar.gz
ffmpeg-8fab4007c83349e5dbaacca735ce698cf94bf8e4.tar.bz2
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.
Diffstat
-rw-r--r--RELEASE1
-rwxr-xr-xversion.sh2
2 files changed, 2 insertions, 1 deletions
diff --git a/RELEASE b/RELEASE
new file mode 100644
index 0000000..eb49d7c
--- a/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)