From c3c73f13bb9ee60ccf40f85dbc11c91efac9d1e2 Mon Sep 17 00:00:00 2001 From: Sean McGovern Date: Wed, 4 Sep 2013 14:15:00 -0700 Subject: [PATCH] configure: don't generate a git version number if .git isn't present --- version.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/version.sh b/version.sh index 5466ef24..2e704647 100755 --- a/version.sh +++ b/version.sh @@ -1,5 +1,8 @@ #!/bin/bash [ -n "$1" ] && cd $1 + +git_version() { +trap 'rm -f config.git-hash' EXIT git rev-list HEAD | sort > config.git-hash LOCALVER=`wc -l config.git-hash | awk '{print $1}'` if [ $LOCALVER \> 1 ] ; then @@ -14,11 +17,13 @@ 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\"" -else - echo "#define X264_VERSION \"\"" - VER="x" + VERSION=" r$VER" fi -rm -f config.git-hash +} + +VER="x" +VERSION="" +[ -d .git ] && (type git >/dev/null 2>&1) && git_version +echo "#define X264_VERSION \"$VERSION\"" API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'` echo "#define X264_POINTVER \"0.$API.$VER\"" -- 2.50.1