From c3c2325adcef1acdafccaba566a854823a95beb0 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 31 Mar 2009 21:06:20 +0000 Subject: [PATCH] Revert hackish release version number hardcoding in version.sh. Originally committed as revision 18287 to svn://svn.ffmpeg.org/ffmpeg/branches/0.5 --- version.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/version.sh b/version.sh index fce5d0da7d..adaa46aa91 100755 --- a/version.sh +++ b/version.sh @@ -1,6 +1,20 @@ #!/bin/sh -revision=0.5 +# check for SVN revision number +revision=$(cat snapshot_version 2> /dev/null) +test $revision || 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) +test $revision && revision=SVN-r$revision + +# check for git short hash +if ! test $revision; then + revision=$(cd "$1" && git log -1 --pretty=format:%h) + test $revision && revision=git-$revision +fi + +# no version number found +test $revision || revision=UNKNOWN test -n "$3" && revision=$revision-$3