From 1c4d61e034b5f5c02da2981946d7e66d025a4647 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Mon, 6 Jul 2026 23:20:40 +0900 Subject: [PATCH] =?utf8?q?make=20gittag=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 2 +- git.mk | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 966c2d7..4d23a63 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ install uninstall \ version gittag copyright \ gitpush gitpushorigin gitpushgithub \ - version_up___stamp \ + version_up___stamp gittag___stamp \ clean src-clean gtags-clean \ test-clean doc-clean doc_inner-clean diff --git a/git.mk b/git.mk index b1c3378..808528c 100644 --- a/git.mk +++ b/git.mk @@ -15,13 +15,13 @@ gitpush___stamp: gittag___stamp $(GIT) push github main --tags $(GIT) rev-parse HEAD > $@ -gittag___stamp: version_up___stamp - $(GIT) tag $(VERSION) main +gittag___stamp: + $(GIT) tag --points-at main | $(GREP) -qx "$(VERSION)" || $(GIT) tag $(VERSION) main $(PRINTF) "%s\n" "$(VERSION)" > $@ version_up___stamp: VERSION if [ -n "$$($(GIT) status -s)" ]; then $(PRINTF) "Error: commit, first.\n"; exit 1; fi - $(GIT) tag --points-at main | $(GREP) -qx "$(VERSION)" || while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done + while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%.1fp%02d\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done $(GIT) add VERSION $(GIT) commit -m "version up" $(CAT) $< >$@ -- 2.47.3