From 5d11fe5cc1bf42ed32e6a3cac86a9b05a1397d12 Mon Sep 17 00:00:00 2001 From: o9000 Date: Sat, 25 Apr 2015 15:45:38 +0200 Subject: [PATCH] Yet another fix for git version script --- get_version.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/get_version.sh b/get_version.sh index 90282a3..f92c895 100755 --- a/get_version.sh +++ b/get_version.sh @@ -1,5 +1,7 @@ #!/bin/sh +DIRTY="" + git update-index -q --ignore-submodules --refresh # Disallow unstaged changes in the working tree if ! git diff-files --quiet --ignore-submodules -- @@ -10,7 +12,7 @@ then git diff-files --name-status -r --ignore-submodules -- >&2 exit 1 else - echo "dirty" + DIRTY="-dirty" fi fi @@ -23,8 +25,10 @@ then git diff-index --cached --name-status -r --ignore-submodules HEAD -- >&2 exit 1 else - echo "dirty" + DIRTY="-dirty" fi fi -git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')" +VERSION=$(git describe --exact-match 2>/dev/null || echo "0.11-git$(git show -s --pretty=format:%cI.%h | tr -d ':' | tr -d '-' | tr '.' '-' | sed 's/T[0-9\+]*//g')")$DIRTY + +echo '#define VERSION_STRING "'$VERSION'"' > version.h