FEATURE: automatic git hash injection

CMakeLists.txt

@@ -19,14 +19,30 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 11)
 
 # custom options
-execute_process(
+#execute_process(
-        COMMAND git log -1 --format=%h
+#        COMMAND git log -1 --format=%h
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+#        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_HASH
+#        OUTPUT_VARIABLE GIT_HASH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
+#        OUTPUT_STRIP_TRAILING_WHITESPACE
-)
+#)
+#
+#add_definitions(-DGIT_HASH=${GIT_HASH})
+
+set(GIT_HASH "undefined")
+find_package(Git QUIET)
+if(GIT_FOUND)
+    execute_process(
+            COMMAND ${GIT_EXECUTABLE} log -1 --pretty=format:%h
+            OUTPUT_VARIABLE GIT_HASH
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+            ERROR_QUIET
+    )
+endif()
+
+message(STATUS "Burning in git hash: ${GIT_HASH}")
+
+add_definitions("-DGIT_HASH=\"${GIT_HASH}\"")
 
-add_definitions(-DGIT_HASH=${GIT_HASH})
 
 #Uncomment for hardware floating point
 #add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING)
@@ -40,7 +56,7 @@ add_compile_options(-mcpu=cortex-m4 -mthumb -mthumb-interwork)
 add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0)
 
 # uncomment to mitigate c++17 absolute addresses warnings
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register")
+#set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wno-register")
 
 # Enable assembler files preprocessing
 add_compile_options($<$<COMPILE_LANGUAGE:ASM>:-x$<SEMICOLON>assembler-with-cpp>)
@@ -96,4 +112,4 @@ add_custom_command(TARGET ${PROJECT_NAME}.elf POST_BUILD
         COMMAND ${CMAKE_OBJCOPY} -Oihex $<TARGET_FILE:${PROJECT_NAME}.elf> ${HEX_FILE}
         COMMAND ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:${PROJECT_NAME}.elf> ${BIN_FILE}
         COMMENT "Building ${HEX_FILE}
-Building ${BIN_FILE}")
+Building ${BIN_FILE}")

Tools/floatpytools/gen_git_rev.py

@@ -1,30 +0,0 @@
-import os.path
-import subprocess
-from jinja2 import Environment, PackageLoader, select_autoescape
-
-def shortgitrev() -> str:
-    return subprocess.check_output(['git', 'rev-parse', '--short', 'HEAD']).decode('ascii').strip()
-
-def gengitrev():
-    env = Environment(
-        loader=PackageLoader("gen_git_rev"),
-        autoescape=select_autoescape()
-        )
-
-    template = env.get_template("git_revision.h")
-
-    stream = template.stream(hash=shortgitrev())
-
-    # Check if in Project root
-    print(os.path.abspath("Core/Inc"))
-    if(os.path.exists(os.path.abspath("Core/Inc"))):
-        print("Core/Inc dir found, generating file...")
-        with open(os.path.abspath("Core/Inc/git_rev.h"), 'w') as fp:
-            stream.dump(fp)
-    else:
-        print("ERROR: Run this script from the Project root!")
-        exit(-1)
-
-
-if __name__ == "__main__":
-    gengitrev()

Tools/floatpytools/templates/git_revision.h

@@ -1,12 +0,0 @@
-//
-// Created by robtor on 15.12.22.
-//
-
-#ifndef FLOATPUMP_GIT_REVISION_TEMPLATE_H
-#define FLOATPUMP_GIT_REVISION_TEMPLATE_H
-
-// Auto generated header file containing the last git revision
-
-#define GIT_HASH "{{ hash }}"
-
-#endif //FLOATPUMP_GIT_REVISION_TEMPLATE_H

floatpump/Core/Inc/git_rev.h

@@ -1,12 +0,0 @@
-//
-// Created by robtor on 15.12.22.
-//
-
-#ifndef FLOATPUMP_GIT_REVISION_TEMPLATE_H
-#define FLOATPUMP_GIT_REVISION_TEMPLATE_H
-
-// Auto generated header file containing the last git revision
-
-#define GIT_HASH "8f1aed9"
-
-#endif //FLOATPUMP_GIT_REVISION_TEMPLATE_H

floatpump/Middlewares/floatpump/Inc/InitSequence.h

@@ -9,7 +9,6 @@
 
 #include "main.h"
 #include "LCD_I2C_Driver.h"
-#include "git_rev.h"
 
 
 namespace floatpump {