From e3e8e47ffc467db97ada1ff1b8bf15a91d22c9a2 Mon Sep 17 00:00:00 2001 From: Connor McLaughlin Date: Thu, 20 Aug 2020 00:43:07 +1000 Subject: [PATCH] scmversion: Add date --- src/scmversion/gen_scmversion.bat | 4 +++- src/scmversion/gen_scmversion.sh | 4 +++- src/scmversion/scmversion.h | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scmversion/gen_scmversion.bat b/src/scmversion/gen_scmversion.bat index 79a19729a..31495cff7 100644 --- a/src/scmversion/gen_scmversion.bat +++ b/src/scmversion/gen_scmversion.bat @@ -4,8 +4,9 @@ SET VERSIONFILE="scmversion.cpp" FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse HEAD`) do (SET "HASH=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git rev-parse --abbrev-ref HEAD`) do (SET "BRANCH=%%g") FOR /F "tokens=* USEBACKQ" %%g IN (`git describe --tags --dirty --exclude latest`) do (SET "TAG=%%g") +FOR /F "tokens=* USEBACKQ" %%g IN (`git log -1 --date=iso8601-strict "--format=%%cd"`) do (SET "CDATE=%%g") -SET SIGNATURELINE=// %HASH% %BRANCH% %TAG% +SET SIGNATURELINE=// %HASH% %BRANCH% %TAG% %CDATE% SET /P EXISTINGLINE=< %VERSIONFILE% IF "%EXISTINGLINE%"=="%SIGNATURELINE%" ( @@ -19,6 +20,7 @@ ECHO Updating %VERSIONFILE%... ECHO const char* g_scm_hash_str = "%HASH%"; ECHO const char* g_scm_branch_str = "%BRANCH%"; ECHO const char* g_scm_tag_str = "%TAG%"; +ECHO const char* g_scm_date_str = "%CDATE%"; )>%VERSIONFILE% EXIT diff --git a/src/scmversion/gen_scmversion.sh b/src/scmversion/gen_scmversion.sh index a6d92b8ac..eed028b26 100755 --- a/src/scmversion/gen_scmversion.sh +++ b/src/scmversion/gen_scmversion.sh @@ -4,8 +4,9 @@ VERSION_FILE="scmversion.cpp" HASH=$(git rev-parse HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD | tr -d '\r\n') TAG=$(git describe --tags --dirty --exclude latest | tr -d '\r\n') +DATE=$(git log -1 --date=iso8601-strict --format=%cd) -SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG}" +SIGNATURE_LINE="// ${HASH} ${BRANCH} ${TAG} ${DATE}" if [ -f $VERSION_FILE ]; then EXISTING_LINE=$(head -n1 $VERSION_FILE | tr -d '\n') @@ -22,6 +23,7 @@ ${SIGNATURE_LINE} const char* g_scm_hash_str = "${HASH}"; const char* g_scm_branch_str = "${BRANCH}"; const char* g_scm_tag_str = "${TAG}"; +const char* g_scm_date_str = "${DATE}"; EOF diff --git a/src/scmversion/scmversion.h b/src/scmversion/scmversion.h index 681da7971..a27ff7a5c 100644 --- a/src/scmversion/scmversion.h +++ b/src/scmversion/scmversion.h @@ -3,4 +3,5 @@ extern const char* g_scm_hash_str; extern const char* g_scm_branch_str; extern const char* g_scm_tag_str; +extern const char* g_scm_date_str;