add hash

.git_archival.txt

@@ -1,3 +1,4 @@
 node: $Format:%H$
+short-node: $Format:%h$
 node-date: $Format:%cI$
 describe-name: $Format:%(describe:tags=true,match=*[0-9]*)$

CMakeLists.txt

@@ -3,12 +3,21 @@ project(openmc C CXX)
 
 # Try to get the version from git describe
 if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+  # Extract the tag
     execute_process(
         COMMAND git describe --tags --match "*[0-9]*" --dirty
         WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
         OUTPUT_VARIABLE VERSION_STRING
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
+
+    # Extract the abbreviated hash
+    execute_process(
+        COMMAND git rev-parse --short HEAD
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE ABBREVIATED_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
 else()
   set(GIT_ARCHIVAL_FILE "${CMAKE_SOURCE_DIR}/.git_archival.txt")
   if(EXISTS "${GIT_ARCHIVAL_FILE}")
@@ -23,6 +32,16 @@ else()
       else()
           message(FATAL_ERROR "Could not extract version from .git_archival.txt")
       endif()
+
+      # Extract the abbreviated hash
+      string(REGEX MATCH "short-node: ([a-f0-9]+)" ABBREVIATED_HASH "${GIT_ARCHIVAL_CONTENT}")
+
+      # If a abbreviated hash is found, use it
+      if(ABBREVIATED_HASH MATCHES "short-node: ([a-f0-9]+)")
+          set(ABBREVIATED_HASH "${CMAKE_MATCH_1}")
+      else()
+          message(FATAL_ERROR "Could not extract abbreviated hash from .git_archival.txt")
+      endif()
   else()
       message(FATAL_ERROR "Neither git describe nor .git_archival.txt is available for versioning.")
   endif()
@@ -31,6 +50,11 @@ endif()
 # Ensure the version string matches a standard format
 if(VERSION_STRING MATCHES "^v?([0-9]+\\.[0-9]+\\.[0-9]+)([-].*)?")
   set(VERSION_NO_SUFFIX "${CMAKE_MATCH_1}")
+  if(VERSION_STRING MATCHES "-.*")
+    set(VERSION_DEV_SUFFIX "true")
+  else()
+    set(VERSION_DEV_SUFFIX "false")
+  endif()
 else()
   message(FATAL_ERROR "Invalid version format: ${VERSION_STRING}")
 endif()
@@ -42,6 +66,8 @@ list(GET VERSION_LIST 1 OPENMC_VERSION_MINOR)
 list(GET VERSION_LIST 2 OPENMC_VERSION_RELEASE)
 set(OPENMC_VERSION ${OPENMC_VERSION_MAJOR}.${OPENMC_VERSION_MINOR}.${OPENMC_VERSION_RELEASE})
 message(STATUS "OpenMC version: ${OPENMC_VERSION}")
+message(STATUS "OpenMC development version: ${VERSION_DEV_SUFFIX}")
+message(STATUS "OpenMC version hash: ${ABBREVIATED_HASH}")
 
 # Generate version.h
 configure_file(include/openmc/version.h.in "${CMAKE_BINARY_DIR}/include/openmc/version.h" @ONLY)

include/openmc/version.h.in

@@ -10,7 +10,8 @@ namespace openmc {
 constexpr int VERSION_MAJOR {@OPENMC_VERSION_MAJOR@};
 constexpr int VERSION_MINOR {@OPENMC_VERSION_MINOR@};
 constexpr int VERSION_RELEASE {@OPENMC_VERSION_RELEASE@};
-constexpr bool VERSION_DEV {true};
+constexpr bool VERSION_DEV {@VERSION_DEV_SUFFIX@};
+constexpr const char* VERSION_HASH = "@ABBREVIATED_HASH@";
 constexpr std::array<int, 3> VERSION {VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE};
 // clang-format on
 

src/output.cpp

@@ -75,10 +75,10 @@ void title()
   // Write version information
   fmt::print(
     "                 | The OpenMC Monte Carlo Code\n"
-    "       Copyright | 2011-2024 MIT, UChicago Argonne LLC, and contributors\n"
+    "       Copyright | 2011-2025 MIT, UChicago Argonne LLC, and contributors\n"
     "         License | https://docs.openmc.org/en/latest/license.html\n"
-    "         Version | {}.{}.{}{}\n",
-    VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE, VERSION_DEV ? "-dev" : "");
+    "         Version | {}.{}.{}{} ({})\n",
+    VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE, VERSION_DEV ? "-dev" : "", VERSION_HASH);
 #ifdef GIT_SHA1
   fmt::print("        Git SHA1 | {}\n", GIT_SHA1);
 #endif