From ce9974cb9570fff4df0d1d7c15adafd5419aafc5 Mon Sep 17 00:00:00 2001
From: Tom Huang <tomghuang@gmail.com>
Date: Fri, 20 Jun 2025 20:06:38 -0700
Subject: [PATCH] fix: update git tag definition and version.tag generation
 process

This patch revises the git tag definition and the interpretation of
version.tag content. Git tags will now follow the SemVer standard,
including optional pre-release metadata but excluding build metadata.
The git commit hash will no longer be part of the git tag.

When generating version.tag, the git commit hash will be appended as
build metadata, ensuring version.tag continues to adhere to the SemVer
standard.
---
 Makefile    | 12 ++++++------
 tools/build |  4 +++-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e8dba25..01efce3 100644
--- a/Makefile
+++ b/Makefile
@@ -81,12 +81,12 @@ help: build-docker-image
   make output-dir             - Create the host output directory\n\
   make shell                  - Open an interactive shell inside the Docker container\n\
 \n\
-The <TAG_NAME> format is: v<MAJOR>.<MINOR>.<PATCH>.<BUILD>. The <BUILD> field is the\n\
-first 7-digit of the HEAD commit SHA-1, which you can get by running 'make githead'.\n\
+The <TAG_NAME> format follows the SemVer standard but excludes build metadata:\n\
+v<MAJOR>.<MINOR>.<PATCH>[-<PRE_RELEASE>], where the <PRE_RELEASE> field is optional.\n\
 Here are some <TAG_NAME> examples (use 'make taglist' to get all available tags):\n\
-  v0.0.1.189221c\n\
-  v1.1.0.bbf3b42\n\
-  v2.0.0.3b42778\n\""
+  v0.0.1\n\
+  v1.1.0-alpha.1\n\
+  v2.0.0-rc.3\n\""
 
 
 .PHONY: build-docker-image
@@ -110,7 +110,7 @@ co: build-docker-image
 	"
 	@git archive $(TAG) | tar -x -C $(ARCHIVE_DIR)/argtable-$(TAG)
 	@$(DOCKER_CMD_PREFIX) sh -c "\
-		printf $(TAG) > $(ARCHIVE_DIR)/argtable-$(TAG)/version.tag \
+		printf "$(TAG)+git.$(shell git rev-parse --short=7 HEAD)" > $(ARCHIVE_DIR)/argtable-$(TAG)/version.tag \
 	"
 
 
diff --git a/tools/build b/tools/build
index e0a7de5..b29c714 100755
--- a/tools/build
+++ b/tools/build
@@ -70,8 +70,10 @@ get_ver () {
   local argtable_ver
   if [ -f "../version.tag" ]; then
     argtable_ver=$(<../version.tag)
+    # Remove build metadata (everything after and including "+")
+    argtable_ver=${argtable_ver%%+*}
   else
-    argtable_ver="master"
+    argtable_ver="v0.0.0"
   fi
   echo "$argtable_ver"
 }