[FFmpeg-cvslog] r18287 - in branches/0.5: libavcodec/aandcttab.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/celp_filters.c libavcodec/celp_filters.h libavcodec/celp_math.c libavcodec/celp_math.h libav...

[diego]

Author: diego
Date: Tue Mar 31 23:06:20 2009
New Revision: 18287

Log:
Revert hackish release version number hardcoding in version.sh.

Modified:
   branches/0.5/libavcodec/aandcttab.c   (props changed)
   branches/0.5/libavcodec/arm/dsputil_iwmmxt_rnd_template.c   (props changed)
   branches/0.5/libavcodec/celp_filters.c   (props changed)
   branches/0.5/libavcodec/celp_filters.h   (props changed)
   branches/0.5/libavcodec/celp_math.c   (props changed)
   branches/0.5/libavcodec/celp_math.h   (props changed)
   branches/0.5/libavcodec/flacdec.c   (props changed)
   branches/0.5/libavcodec/imgconvert_template.c   (props changed)
   branches/0.5/libavcodec/options.c   (props changed)
   branches/0.5/libavcodec/vdpau.h   (props changed)
   branches/0.5/libavcodec/vp6dsp.c   (props changed)
   branches/0.5/libavcodec/x86/   (props changed)
   branches/0.5/libavcodec/x86/dsputil_mmx_avg_template.c   (props changed)
   branches/0.5/libavcodec/x86/dsputil_mmx_qns_template.c   (props changed)
   branches/0.5/libavcodec/x86/dsputil_mmx_rnd_template.c   (props changed)
   branches/0.5/libavdevice/oss_audio.c   (props changed)
   branches/0.5/libavformat/asf.c   (props changed)
   branches/0.5/libavformat/asfdec.c   (props changed)
   branches/0.5/libavformat/asfenc.c   (props changed)
   branches/0.5/libavformat/flacdec.c   (props changed)
   branches/0.5/libavformat/flacenc.c   (props changed)
   branches/0.5/libavformat/flacenc.h   (props changed)
   branches/0.5/libavformat/metadata.c   (props changed)
   branches/0.5/libavformat/metadata.h   (props changed)
   branches/0.5/libavformat/mxf.c   (props changed)
   branches/0.5/libavformat/mxf.h   (props changed)
   branches/0.5/libavformat/mxfdec.c   (props changed)
   branches/0.5/libavformat/options.c   (props changed)
   branches/0.5/libavformat/rtpdec.h   (props changed)
   branches/0.5/libavformat/rtpenc.h   (props changed)
   branches/0.5/libavutil/avstring.c   (props changed)
   branches/0.5/libavutil/pixfmt.h   (props changed)
   branches/0.5/libavutil/timer.h   (props changed)
   branches/0.5/version.sh

Modified: branches/0.5/version.sh
==============================================================================
--- branches/0.5/version.sh	Tue Mar 31 22:13:29 2009	(r18286)
+++ branches/0.5/version.sh	Tue Mar 31 23:06:20 2009	(r18287)
@@ -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