From 6de9518de77449e1b79ace4fa15320cea2b1fb4e Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 6 Sep 2025 06:25:27 -0400 Subject: [PATCH] v0.2.10 - Clean versioning --- Makefile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 5041f97..e5b79f9 100644 --- a/Makefile +++ b/Makefile @@ -40,14 +40,15 @@ $(NOSTR_CORE_LIB): src/version.h: @if [ -d .git ]; then \ echo "Generating version.h from git tags..."; \ - VERSION=$$(git describe --tags --always --dirty 2>/dev/null || echo "unknown"); \ - if echo "$$VERSION" | grep -q "^v[0-9]"; then \ - CLEAN_VERSION=$$(echo "$$VERSION" | sed 's/^v//'); \ + RAW_VERSION=$$(git describe --tags --always 2>/dev/null || echo "unknown"); \ + if echo "$$RAW_VERSION" | grep -q "^v[0-9]"; then \ + CLEAN_VERSION=$$(echo "$$RAW_VERSION" | sed 's/^v//' | cut -d- -f1); \ + VERSION="v$$CLEAN_VERSION"; \ MAJOR=$$(echo "$$CLEAN_VERSION" | cut -d. -f1); \ MINOR=$$(echo "$$CLEAN_VERSION" | cut -d. -f2); \ - PATCH=$$(echo "$$CLEAN_VERSION" | cut -d. -f3 | cut -d- -f1); \ + PATCH=$$(echo "$$CLEAN_VERSION" | cut -d. -f3); \ else \ - CLEAN_VERSION="0.0.0-$$VERSION"; \ + VERSION="v0.0.0"; \ MAJOR=0; MINOR=0; PATCH=0; \ fi; \ echo "/* Auto-generated version information */" > src/version.h; \ @@ -60,10 +61,10 @@ src/version.h: echo "#define VERSION_PATCH $$PATCH" >> src/version.h; \ echo "" >> src/version.h; \ echo "#endif /* VERSION_H */" >> src/version.h; \ - echo "Generated version.h with version: $$VERSION"; \ + echo "Generated version.h with clean version: $$VERSION"; \ elif [ ! -f src/version.h ]; then \ echo "Git not available and version.h missing, creating fallback version.h..."; \ - VERSION="unknown"; \ + VERSION="v0.0.0"; \ echo "/* Auto-generated version information */" > src/version.h; \ echo "#ifndef VERSION_H" >> src/version.h; \ echo "#define VERSION_H" >> src/version.h; \