From f5de8d1f37cf4d59db44f6aec136aea67455619b Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Tue, 28 Jan 2025 11:40:56 +0100
Subject: [PATCH] Somewhat better version handling

---
 Makefile             | 11 +++++------
 rex_client/Makefile  |  5 ++++-
 rex_client/main.go   |  6 ++----
 rex_server/Makefile  |  5 ++++-
 rex_server/server.go |  4 ++++
 5 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 9d4657d..4fb534f 100644
--- a/Makefile
+++ b/Makefile
@@ -17,19 +17,18 @@ help:
 	@echo "  help       - Show this help message"
 
 release: $(RELEASE_NAME)
-	make -C ./rex_client
-	make -C ./rex_server
+	make -C ./rex_client REX_VERSION=$(REX_VERSION)
+	make -C ./rex_server REX_VERSION=$(REX_VERSION)
 	mv ./rex_client/rexclient $(RELEASE_NAME)
 	mv ./rex_server/rexserver $(RELEASE_NAME)
 	cp ./LICENSE.txt $(RELEASE_NAME)
-	cp ./VERSION.txt $(RELEASE_NAME)
 	cp ./README.md $(RELEASE_NAME)
 	mkdir -p $(RELEASE_NAME)/source
 	cp ./VERSION.txt $(RELEASE_NAME)/source
 	git ls-files | xargs -I{} cp --parents {} $(RELEASE_NAME)/source
-	date -I > $(RELEASE_NAME)/VERSION.txt
-	echo $(rev) >> $(RELEASE_NAME)/VERSION.txt
-	go version >> $(RELEASE_NAME)/VERSION.txt
+	date -I > $(RELEASE_NAME)/INFO.txt
+	echo $(REX_VERSION) >> $(RELEASE_NAME)/INFO.txt
+	go version >> $(RELEASE_NAME)/INFO.txt
 	tar cvzf $(RELEASE_NAME).tar.gz $(RELEASE_NAME)
 
 $(RELEASE_NAME):
diff --git a/rex_client/Makefile b/rex_client/Makefile
index 0a14788..9ba41b8 100644
--- a/rex_client/Makefile
+++ b/rex_client/Makefile
@@ -1,7 +1,10 @@
 NAME = rexclient
 
+VERSION_FILE := ../VERSION.txt
+REX_VERSION ?= $(shell cat $(VERSION_FILE))
+
 build: commit.txt
-	go build -tags no_emoji -trimpath -ldflags="-s -w" -buildvcs=false -o $(NAME)
+	go build -tags no_emoji -trimpath -ldflags="-s -w -X main.rex_version=$(REX_VERSION)" -buildvcs=false -o $(NAME)
 
 run: commit.txt
 	go run .
diff --git a/rex_client/main.go b/rex_client/main.go
index 8acea0c..6e639bb 100644
--- a/rex_client/main.go
+++ b/rex_client/main.go
@@ -15,13 +15,11 @@ import (
 	model "rex_model"
 )
 
-//go:generate sh -c "printf %s $(git rev-parse --short HEAD) > commit.txt"
-//go:embed commit.txt
-var git_rev string
+var rex_version = "UNDEFINED"
 
 func main() {
 	a := app.New()
-	w := a.NewWindow(fmt.Sprintf("RexForge %s", strings.ToUpper(git_rev)))
+	w := a.NewWindow(fmt.Sprintf("RexForge %s", strings.ToUpper(rex_version)))
 	w.Resize(fyne.NewSize(900, 600))
 
 	addons := model.AddonIndex
diff --git a/rex_server/Makefile b/rex_server/Makefile
index 7c311b1..5b8b298 100644
--- a/rex_server/Makefile
+++ b/rex_server/Makefile
@@ -1,7 +1,10 @@
 NAME = rexserver
 
+VERSION_FILE := ../VERSION.txt
+REX_VERSION ?= $(shell cat $(VERSION_FILE))
+
 build: commit.txt
-	go build -o $(NAME)
+	go build -ldflags="-X main.rex_version=$(REX_VERSION)" -o $(NAME)
 
 run: commit.txt
 	go run .
diff --git a/rex_server/server.go b/rex_server/server.go
index 5857f3d..9329fe0 100644
--- a/rex_server/server.go
+++ b/rex_server/server.go
@@ -7,11 +7,15 @@ import (
 	"net/http"
 	"rex_model"
 	"time"
+	"strings"
 )
 
+var rex_version = "UNDEFINED"
+
 func main() {
 	port := ":8080"
 	addons := rex_model.AddonIndex
+	log.Printf("Starting RexForge server version: %s", strings.ToUpper(rex_version))
 
 	mux := http.NewServeMux()