[FFmpeg-cvslog] r18288 - in branches/0.5: VERSION version.sh

[diego]

Author: diego
Date: Tue Mar 31 23:11:04 2009
New Revision: 18288

Log:
Merge improved version number generation from trunk.

Added:
   branches/0.5/VERSION
Modified:
   branches/0.5/version.sh

Added: branches/0.5/VERSION
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/0.5/VERSION	Tue Mar 31 23:11:04 2009	(r18288)
@@ -0,0 +1 @@
+0.5

Modified: branches/0.5/version.sh
==============================================================================
--- branches/0.5/version.sh	Tue Mar 31 23:06:20 2009	(r18287)
+++ branches/0.5/version.sh	Tue Mar 31 23:11:04 2009	(r18288)
@@ -13,12 +13,16 @@ if ! test $revision; then
     test $revision && revision=git-$revision
 fi
 
-# no version number found
+# no revision number found
 test $revision || revision=UNKNOWN
 
-test -n "$3" && revision=$revision-$3
+# releases extract the version number from the VERSION file
+version=$(cat VERSION 2> /dev/null)
+test $version || version=$revision
 
-NEW_REVISION="#define FFMPEG_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