From fd3c12de84224f51fb1b373e27825c29f5063b5e Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Mon, 12 Jul 2021 22:38:29 +1000 Subject: [PATCH] scmversion: Use source directory as git directory Fixes tagging in out of directory builds. --- src/scmversion/gen_scmversion.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh index e47816fff..1a8baa52a 100755 --- a/src/scmversion/gen_scmversion.sh +++ b/src/scmversion/gen_scmversion.sh @@ -1,11 +1,17 @@ #!/bin/sh VERSION_FILE="scmversion.cpp" + +CURDIR=$(pwd) +cd $(dirname $(readlink -f $0)) + HASH=$(git rev-parse HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') TAG=$(git describe --tags --dirty --exclude latest --exclude preview --exclude play-store-release | tr -d '\r\n') DATE=$(git log -1 --date=iso8601-strict --format=%cd) +cd $CURDIR + SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}" if [ -f $VERSION_FILE ]; then