From: j8takagi <j8takagi@nifty.com>
Date: Tue, 7 Jul 2026 08:56:52 +0000 (+0900)
Subject: version up to v0.6p12
X-Git-Tag: v0.6p14
X-Git-Url: https://www.j8takagi.net/gitweb?a=commitdiff_plain;h=bcf31618431289ed1749738609c28f6e33dd5821;p=yacasl2.git

version up to v0.6p12
---

diff --git a/Makefile b/Makefile
index d6edaf7..74081db 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,6 @@ prefix ?= ~
 bindir ?= $(prefix)/bin
 libdir ?= $(prefix)/share
 
-VERSION := $(shell $(CAT) VERSION)
-
-VERSIONGITREF = $(shell $(GIT) show-ref -s --tags $(VERSION))
-
-MAINGITREF = $(shell $(GIT) show-ref -s refs/heads/main)
-
 VERSIONFILES := include/version.h test/system/casl2_opt/opt_v/0.txt test/system/comet2_opt/opt_v/0.txt test/system/dumpword/opt_v/0.txt
 
 CMDFILES := casl2 comet2 dumpword casl2rev comet2monitor
diff --git a/VERSION b/VERSION
index 3e8610b..9f82099 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.6p12
+v0.6p14
diff --git a/git.mk b/git.mk
index 1b0da34..7f22264 100644
--- a/git.mk
+++ b/git.mk
@@ -5,22 +5,21 @@ GREP := grep
 PRINTF := printf
 SED := sed
 
-
 gitpush___stamp: gittag___stamp
 	$(GIT) push origin main --tags
 	$(GIT) push github main --tags
 	$(GIT) rev-parse HEAD > $@
 
 gittag___stamp: patchup___stamp
-	$(GIT) tag --points-at HEAD | $(GREP) -qx "$(VERSION)" || $(GIT) tag $(VERSION) main
-	$(PRINTF) "%s\n" "$(VERSION)" > $@
+	$(GIT) tag --points-at HEAD | $(GREP) -qx "$$($(CAT) VERSION)" || $(GIT) tag $$($(CAT) VERSION) main
+	$(PRINTF) "%s\n" "$$($(CAT) VERSION)" > $@
 
 patchup___stamp:
 	git diff-index --quiet HEAD -- || ($(PRINTF) "Error: commit, first.\n"; exit 1)
 # VERSION FORMAT: v<VERSIONNO>p<PATCHNO> (Example: v0.1p0)
 	$(GIT) tag --points-at HEAD | $(GREP) -qx "$$(cat VERSION)" && exit 0 || while $(GIT) rev-parse -q --verify $$(cat VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $$($(SED) 's/v\([0-9]*\.[0-9]*\)p.*$$/\1/' VERSION) $$($(EXPR) $$($(SED) 's/^.*p//' VERSION)  + 1) >VERSION; done;
-	git diff-index --quiet HEAD -- || $(GIT) commit -a -m "version up to $(VERSION)"
-	$(PRINTF) "%s\n" "$(VERSION)" >$@
+	git diff-index --quiet HEAD -- || $(GIT) commit -a -m "version up to $$($(CAT) VERSION)"
+	$(PRINTF) "%s\n" "$$($(CAT) VERSION)" >$@
 
 gitclean:
 	$(RM) *___stamp