stop trying to get git branch and commit hash locally... it adds too much complexity for such a small task. just use CI magic vars and use sensible defaults where applicable

Author: tomdaley92

macos/makefile

@@ -1,22 +1,19 @@
 APP_NAME = Kiwi8
 
-# Auto-detect version: use GITHUB_REF_NAME if set (CI), else git describe, else git branch
-ifeq ($(origin GITHUB_REF_NAME), environment)
-VERSION := $(GITHUB_REF_NAME)
-else
-VERSION := $(shell git describe --tags --exact-match 2>/dev/null || git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "unknown")
+# Use GITHUB_REF_NAME from GitHub Actions, or default values for local builds
+VERSION ?= $(GITHUB_REF_NAME)
+ifeq ($(VERSION),)
+VERSION = unknown
 endif
 
-# CFBundleVersion: Use git commit hash (unique identifier)
-COMMIT_HASH := $(shell git rev-parse --short HEAD 2>/dev/null || echo "unknown")
+SUB_VERSION := $(if $(GITHUB_SHA),$(shell echo $(GITHUB_SHA) | cut -c1-7),unknown)
 
-APP_NAME_VERSION = $(APP_NAME) $(VERSION)
 APP_MANIFEST = src/Info.plist
 APP_BUNDLE = $(APP_NAME).app
 APP_EXE = $(APP_NAME)
 
 CC = clang++
-CFLAGS = -std=c++17 -Wall -mmacosx-version-min=11.0 -arch x86_64 -arch arm64 -MMD -MP -DAPP_NAME_VERSION='"$(APP_NAME_VERSION)"' -DCOMMIT_HASH='"$(COMMIT_HASH)"'
+CFLAGS = -std=c++17 -Wall -mmacosx-version-min=11.0 -arch x86_64 -arch arm64 -MMD -MP -DAPP_NAME='"$(APP_NAME)"' -DVERSION='"$(VERSION)"' -DSUB_VERSION='"$(SUB_VERSION)"'
 LFLAGS = -mmacosx-version-min=11.0
 INCS = -I../external/sdl/build/include/ -I../external/imgui/ -I../shared/
 LIBS = -L../external/sdl/build/lib/ -lSDL2-2.0.0 -framework Cocoa -framework OpenGL
@@ -66,7 +63,7 @@ $(BOOTROM_HEADER): $(BOOTROM_SOURCE)
 
 # Generate Info.plist from template with version substitution
 $(APP_MANIFEST): $(APP_MANIFEST).in
-	sed -e 's/@VERSION@/$(VERSION)/g' -e 's/@COMMIT_HASH@/$(COMMIT_HASH)/g' $< > $@
+	sed -e 's/@APP_NAME@/$(APP_NAME)/g' -e 's/@VERSION@/$(VERSION)/g' -e 's/@SUB_VERSION@/$(SUB_VERSION)/g' $< > $@
 
 # Pattern rules for incremental compilation
 %.o: ../shared/%.cc $(LICENSE_HEADER) $(BOOTROM_HEADER)

macos/src/Info.plist.in

@@ -3,7 +3,7 @@
     <plist version="1.0">
     <dict>
         <key>CFBundleExecutable</key>
-        <string>Kiwi8</string>
+        <string>@APP_NAME@</string>
         <key>CFBundleIdentifier</key>
         <string>net.kiwi-labs.kiwi8</string>
         <key>CFBundleIconFile</key>
@@ -15,7 +15,7 @@
         <key>CFBundleShortVersionString</key>
         <string>@VERSION@</string>
         <key>CFBundleVersion</key>
-        <string>@COMMIT_HASH@</string>
+        <string>@SUB_VERSION@</string>
         <key>LSMinimumSystemVersion</key>
         <string>11.0</string>
         <key>NSHighResolutionCapable</key>

shared/Chip8.h

@@ -6,16 +6,22 @@
 #include "Input.h"
 #include "Audio.h"
 
-// APP_NAME_VERSION is defined by the compiler via -DAPP_NAME_VERSION="..."
+// APP_NAME is defined by the compiler via -DAPP_NAME="..."
 // Falls back to generic name if not defined (shouldn't happen in normal builds)
-#ifndef APP_NAME_VERSION
-#define APP_NAME_VERSION "Kiwi8"
+#ifndef APP_NAME
+#define APP_NAME "Kiwi8"
 #endif
 
-// COMMIT_HASH is defined by the compiler via -DCOMMIT_HASH="..."
+// VERSION is defined by the compiler via -DVERSION="..."
+// Falls back to unknown if not defined (shouldn't happen in normal builds)
+#ifndef VERSION
+#define VERSION "unknown"
+#endif
+
+// SUB_VERSION is defined by the compiler via -DSUB_VERSION="..."
 // Falls back to generic name if not defined (shouldn't happen in normal builds)
-#ifndef COMMIT_HASH
-#define COMMIT_HASH "unknown"
+#ifndef SUB_VERSION
+#define SUB_VERSION "unknown"
 #endif
 
 #define MEM_SIZE 4096

shared/Gui.cc

@@ -221,7 +221,7 @@ void Gui::HelpWindows() {
         ImGui::Begin("About", &show_about);
 
         ImGui::TextWrapped(
-            APP_NAME_VERSION " (" COMMIT_HASH ")\n"
+            APP_NAME " " VERSION " (" SUB_VERSION ")\n"
             "\n"
             "A cross-platform Chip-8 interpreter written\n"
             "in C-Style C++ using SDL2, ImGui, and OpenGL.\n"

windows/makefile

@@ -1,40 +1,25 @@
 APP_NAME = Kiwi8
 
-# Auto-detect version: use GITHUB_REF_NAME if set (CI), else git describe, else git branch
-!IFNDEF GITHUB_REF_NAME
-# Try git describe for exact tag match
-!IF [git describe --tags --exact-match > .version.tmp 2>nul] == 0
-!INCLUDE .version.tmp
-# Try git branch name
-!ELSE IF [git rev-parse --abbrev-ref HEAD > .version.tmp 2>nul] == 0
-!INCLUDE .version.tmp
+# Use GITHUB_REF_NAME from GitHub Actions, or default values for local builds
+!IFDEF GITHUB_REF_NAME
+VERSION = $(GITHUB_REF_NAME)
 !ELSE
 VERSION = unknown
 !ENDIF
-# Clean up temp file
-!IF [del .version.tmp 2>nul]
-!ENDIF
-!ELSE
-VERSION = $(GITHUB_REF_NAME)
-!ENDIF
 
-# Git commit hash (unique identifier for build)
-!IF [git rev-parse --short HEAD > .hash.tmp 2>nul && echo COMMIT_HASH = > .commit.tmp && type .hash.tmp >> .commit.tmp] == 0
-!INCLUDE .commit.tmp
+!IFDEF GITHUB_SHA
+# Extract first 7 characters of GITHUB_SHA
+SUB_VERSION = $(GITHUB_SHA:~0,7)
 !ELSE
-COMMIT_HASH = unknown
-!ENDIF
-# Clean up temp files
-!IF [del .hash.tmp .commit.tmp 2>nul]
+SUB_VERSION = unknown
 !ENDIF
 
-APP_NAME_VERSION = $(APP_NAME) $(VERSION)
 APP_EXE = $(APP_NAME).exe
 APP_PDB = $(APP_NAME).pdb
 APP_RES = $(APP_NAME).res
 
 CC = CL
-CFLAGS = /std:c++17 /W4 /MD /nologo /w44996 "/DAPP_NAME_VERSION=\"$(APP_NAME_VERSION)\"" "/DCOMMIT_HASH=\"$(COMMIT_HASH)\""
+CFLAGS = /std:c++17 /W4 /MD /nologo /w44996 "/DAPP_NAME=\"$(APP_NAME)\"" "/DVERSION=\"$(VERSION)\"" "/DSUB_VERSION=\"$(SUB_VERSION)\""
 LFLAGS = /link \
 		 /LIBPATH:..\external\sdl\build\lib \
 		 /ENTRY:mainCRTStartup