[x264-devel] commit: Modify version.sh to output to stdout. (Alex Jurkiewicz )
git at videolan.org
git at videolan.org
Fri May 21 10:33:13 CEST 2010
x264 | branch: master | Alex Jurkiewicz <alex at bluebottle.net.au> | Thu May 20 15:01:37 2010 +0800| [8ff16c56ee5aba39ab0c278df2a2e94282eb29f3] | committer: Jason Garrett-Glaser
Modify version.sh to output to stdout.
Update configure to match.
> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=8ff16c56ee5aba39ab0c278df2a2e94282eb29f3
---
configure | 2 +-
version.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index d02d2d4..e9e45cd 100755
--- a/configure
+++ b/configure
@@ -684,7 +684,7 @@ if [ "$shared" = "yes" ]; then
echo 'default: $(SONAME)' >> config.mak
fi
-./version.sh
+./version.sh >> config.h
pclibs="-L$libdir -lx264 $libpthread"
diff --git a/version.sh b/version.sh
index 03b070b..b777209 100755
--- a/version.sh
+++ b/version.sh
@@ -9,11 +9,11 @@ if [ $LOCALVER \> 1 ] ; then
VER="${VER}M"
fi
VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
- echo "#define X264_VERSION \" r$VER\"" >> config.h
+ echo "#define X264_VERSION \" r$VER\""
else
- echo "#define X264_VERSION \"\"" >> config.h
+ echo "#define X264_VERSION \"\""
VER="x"
fi
rm -f config.git-hash
API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
-echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
+echo "#define X264_POINTVER \"0.$API.$VER\""
More information about the x264-devel
mailing list