version up to v0.6p12

diff --git a/Makefile b/Makefile
index d6edaf76307804b110f1fe8b9b7e1cfdcbf4bc83..74081db6eb2e3e1464d213dfde84a14faad98c7f 100644 (file)
--- 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 3e8610b06f3412da021b4d8215cedcf168ce291f..9f8209927cca0c449fd78cb5d8b414d461ba6f17 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v0.6p12
+v0.6p14

diff --git a/git.mk b/git.mk
index 1b0da340002e13a0fbbad398a3e7fb40db11ad01..7f22264d67f8736ded05793e5532b6978dc5a6f1 100644 (file)
--- 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