From 36c6caa7c02d57601f8f2fa016f6d829912cb360 Mon Sep 17 00:00:00 2001
From: Michael Legleux <legleux@users.noreply.github.com>
Date: Fri, 17 May 2024 14:40:41 -0700
Subject: [PATCH] Date of commit in version string; No git hash in release
 version (#1409)

A release's version string should be a signed annotated tag which Clio
has generally been following.

Uses the date of the commit since that seems like a more useful item to
track to not have identical source builds have different version
strings.
---
 .githooks/check-format  | 2 +-
 cmake/ClioVersion.cmake | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.githooks/check-format b/.githooks/check-format
index 3596b61f..c6bd6693 100755
--- a/.githooks/check-format
+++ b/.githooks/check-format
@@ -73,7 +73,7 @@ else
     grep_code '#include ".*"' | xargs sed -i -E 's|#include "(.*)"|#include <\1>|g'
 
     # make local includes to be "..." style
-    main_src_dirs=$(find ./src -type d -maxdepth 1 -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g')
+    main_src_dirs=$(find ./src -maxdepth 1 -type d  -exec basename {} \; | paste -sd '|' | sed 's/|/\\|/g')
     grep_code "#include <\($main_src_dirs\)/.*>" | xargs sed -i -E "s|#include <(($main_src_dirs)/.*)>|#include \"\1\"|g"
 fi
 
diff --git a/cmake/ClioVersion.cmake b/cmake/ClioVersion.cmake
index 46928ad5..d8e194e3 100644
--- a/cmake/ClioVersion.cmake
+++ b/cmake/ClioVersion.cmake
@@ -22,7 +22,11 @@ endif ()
 
 if (NOT (BRANCH MATCHES master OR BRANCH MATCHES release/*)) # for develop and any other branch name
                                                              # YYYYMMDDHMS-<branch>-<git-rev>
-  execute_process(COMMAND date +%Y%m%d%H%M%S OUTPUT_VARIABLE DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+  set(GIT_COMMAND show -s --date=format:%Y%m%d%H%M%S --format=%cd)
+  execute_process(
+    COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} OUTPUT_VARIABLE DATE
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
   set(CLIO_VERSION "${DATE}-${BRANCH}-${REV}")
   set(DOC_CLIO_VERSION "develop")
 else ()
@@ -31,7 +35,7 @@ else ()
     COMMAND ${GIT_EXECUTABLE} ${GIT_COMMAND} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE CLIO_TAG_VERSION
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  set(CLIO_VERSION "${CLIO_TAG_VERSION}-${REV}")
+  set(CLIO_VERSION "${CLIO_TAG_VERSION}")
   set(DOC_CLIO_VERSION "${CLIO_TAG_VERSION}")
 endif ()