From d39e531e7516a35d41ee8766de6b15edb2e71c6c Mon Sep 17 00:00:00 2001
From: vaxerski <43317083+vaxerski@users.noreply.github.com>
Date: Tue, 10 Oct 2023 15:01:30 +0100
Subject: [PATCH] better versioning

---
 .gitignore                 |  2 ++
 CMakeLists.txt             | 30 ++----------------------------
 scripts/generateVersion.sh | 14 ++++++++++++++
 src/macros.hpp             | 27 ++++++++-------------------
 src/version.h.in           |  5 +++++
 5 files changed, 31 insertions(+), 47 deletions(-)
 create mode 100755 scripts/generateVersion.sh
 create mode 100644 src/version.h.in

diff --git a/.gitignore b/.gitignore
index 96fd6c87..dfee530e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ gmon.out
 *.tar.gz
 
 PKGBUILD
+
+src/version.h
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b3bc5526..29eccd64 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,34 +21,8 @@ message(STATUS "Gathering git info")
 # Get git info
 # hash and branch
 execute_process(
-    COMMAND git rev-parse --abbrev-ref HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_BRANCH
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND git rev-parse HEAD
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_HASH
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND sh -c "git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1 | sed -e 's/#//g' -e 's/\"//g'"
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_COMMIT_MESSAGE
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND sh -c "git diff-index --quiet HEAD -- || echo \"dirty\""
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_DIRTY
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-execute_process(
-    COMMAND sh -c "git describe --tags"
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    OUTPUT_VARIABLE GIT_TAG
-    OUTPUT_STRIP_TRAILING_WHITESPACE)
+    COMMAND ./scripts/generateVersion.sh
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 #
 #
 
diff --git a/scripts/generateVersion.sh b/scripts/generateVersion.sh
new file mode 100755
index 00000000..01bf1539
--- /dev/null
+++ b/scripts/generateVersion.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+cp ./src/version.h.in ./src/version.h -fr
+
+HASH=$(git rev-parse HEAD)
+BRANCH=$(git rev-parse --abbrev-ref HEAD)
+MESSAGE=$(git show ${GIT_COMMIT_HASH} | head -n 5 | tail -n 1 | sed -e 's/#//g' -e 's/\"//g')
+DIRTY=$(git diff-index --quiet HEAD -- || echo \"dirty\")
+TAG=$(git describe --tags)
+
+awk -i inplace "{sub(/@HASH@/,\"${HASH}\")}1" ./src/version.h
+awk -i inplace "{sub(/@BRANCH@/,\"${BRANCH}\")}1" ./src/version.h
+awk -i inplace "{sub(/@MESSAGE@/,\"${MESSAGE}\")}1" ./src/version.h
+awk -i inplace "{sub(/@DIRTY@/,\"${DIRTY}\")}1" ./src/version.h
+awk -i inplace "{sub(/@TAG@/,\"${TAG}\")}1" ./src/version.h
\ No newline at end of file
diff --git a/src/macros.hpp b/src/macros.hpp
index 8874ad3e..eada3a9f 100644
--- a/src/macros.hpp
+++ b/src/macros.hpp
@@ -14,22 +14,7 @@
 #define ISDEBUG false
 #endif
 
-// git stuff
-#ifndef GIT_COMMIT_HASH
-#define GIT_COMMIT_HASH "?"
-#endif
-#ifndef GIT_BRANCH
-#define GIT_BRANCH "?"
-#endif
-#ifndef GIT_COMMIT_MESSAGE
-#define GIT_COMMIT_MESSAGE "?"
-#endif
-#ifndef GIT_DIRTY
-#define GIT_DIRTY "?"
-#endif
-#ifndef GIT_TAG
-#define GIT_TAG "?"
-#endif
+#include "version.h"
 
 #define SPECIAL_WORKSPACE_START (-99)
 
@@ -57,7 +42,7 @@
     if (!(expr)) {                                                                                                                                                                 \
         Debug::log(CRIT, "\n==========================================================================================\nASSERTION FAILED! \n\n{}\n\nat: line {} in {}",            \
                    std::format(reason, ##__VA_ARGS__), __LINE__,                                                                                                                   \
-                   ([]() constexpr -> std::string { return std::string(__FILE__).substr(std::string(__FILE__).find_last_of('/') + 1); })());                                       \
+                   ([]() constexpr->std::string { return std::string(__FILE__).substr(std::string(__FILE__).find_last_of('/') + 1); })());                                         \
         printf("Assertion failed! See the log in /tmp/hypr/hyprland.log for more info.");                                                                                          \
         raise(SIGABRT);                                                                                                                                                            \
     }
@@ -76,7 +61,9 @@
     }
 
 #define FORMAT_FLAG(spec__, flag__)                                                                                                                                                \
-    case spec__: (flag__) = true; break;
+    case spec__:                                                                                                                                                                   \
+        (flag__) = true;                                                                                                                                                           \
+        break;
 
 #define FORMAT_NUMBER(buf__)                                                                                                                                                       \
     case '0':                                                                                                                                                                      \
@@ -88,7 +75,9 @@
     case '6':                                                                                                                                                                      \
     case '7':                                                                                                                                                                      \
     case '8':                                                                                                                                                                      \
-    case '9': (buf__).push_back(*it); break;
+    case '9':                                                                                                                                                                      \
+        (buf__).push_back(*it);                                                                                                                                                    \
+        break;
 
 #if ISDEBUG
 #define UNREACHABLE()                                                                                                                                                              \
diff --git a/src/version.h.in b/src/version.h.in
new file mode 100644
index 00000000..01cfa7c5
--- /dev/null
+++ b/src/version.h.in
@@ -0,0 +1,5 @@
+#define GIT_COMMIT_HASH    "@HASH@"
+#define GIT_BRANCH         "@BRANCH@"
+#define GIT_COMMIT_MESSAGE "@MESSAGE@"
+#define GIT_DIRTY          "@DIRTY@"
+#define GIT_TAG            "@TAG@"
\ No newline at end of file