From 62ed1c0f9606943fd419a0885c15267de3952ad6 Mon Sep 17 00:00:00 2001 From: wsnipex Date: Mon, 16 Feb 2015 09:58:28 +0100 Subject: [PATCH] only check for a git rev if the src tree is in a git repo fixes the version string when building from the kodi depends src tree --- version.sh | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/version.sh b/version.sh index f9754eb3cf23e..cc23f805e30fc 100755 --- a/version.sh +++ b/version.sh @@ -2,30 +2,32 @@ # Usage: version.sh +if [ -d $1/.git ]; then # only check for a git rev, if the src tree is in a git repo # check for git short hash -if ! test "$revision"; then + if ! test "$revision"; then if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) else revision=$(cd "$1" && git describe --tags --always 2> /dev/null) fi -fi + fi + + # Shallow Git clones (--depth) do not have the N tag: + # use 'git-YYYY-MM-DD-hhhhhhh'. + test "$revision" || revision=$(cd "$1" && + git log -1 --pretty=format:"git-%cd-%h" --date=short 2> /dev/null) -# Shallow Git clones (--depth) do not have the N tag: -# use 'git-YYYY-MM-DD-hhhhhhh'. -test "$revision" || revision=$(cd "$1" && - git log -1 --pretty=format:"git-%cd-%h" --date=short 2> /dev/null) - -# Snapshots from gitweb are in a directory called ffmpeg-hhhhhhh or -# ffmpeg-HEAD-hhhhhhh. -if [ -z "$revision" ]; then - srcdir=$(cd "$1" && pwd) - case "$srcdir" in - */ffmpeg-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]) - git_hash="${srcdir##*-}";; - */ffmpeg-HEAD-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]) - git_hash="${srcdir##*-}";; - esac + # Snapshots from gitweb are in a directory called ffmpeg-hhhhhhh or + # ffmpeg-HEAD-hhhhhhh. + if [ -z "$revision" ]; then + srcdir=$(cd "$1" && pwd) + case "$srcdir" in + */ffmpeg-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]) + git_hash="${srcdir##*-}";; + */ffmpeg-HEAD-[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]) + git_hash="${srcdir##*-}";; + esac + fi fi # no revision number found