From 9b852b78f6f515b5f79b4e5cd73cf5a17b9a8ef3 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Sat, 13 Jun 2026 16:52:01 +0900 Subject: [PATCH] =?utf8?q?Makefile=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Makefile | 13 ------------- git.mk | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Makefile b/Makefile index f01859e..30ca78e 100644 --- a/Makefile +++ b/Makefile @@ -87,19 +87,6 @@ version: $(VERSIONFILES) $(VERSIONFILES): VERSION @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@ -gittag: - if test `$(GIT) status -s | $(WC) -l` -gt 0; then $(ECHO) "Error: commit, first."; exit 1; fi; if test "$(VERSIONGITREF)" != "$(MAINGITREF)"; then $(GIT) tag $(VERSION); fi - -gitpush: gitpushorigin gitpushgithub - -gitpushorigin: - $(GIT) push origin main - $(GIT) push origin $(VERSION) - -gitpushgithub: - $(GIT) push github main - $(GIT) push github $(VERSION) - copyright: LICENSE.copyright___stamp README.copyright___stamp %.copyright___stamp: % diff --git a/git.mk b/git.mk index ec7252a..2e9d8f8 100644 --- a/git.mk +++ b/git.mk @@ -25,7 +25,7 @@ commit___stamp: version_up___stamp version_up___stamp: VERSION if [ -n "$$($(GIT) status -s)" ]; then $(PRINTF) "Error: commit, first.\n"; exit 1; fi - while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "DEBUG - ver: %s; patch:%s;\n" $(VERSIONNO) $(PATCHNO); $(PRINTF) "v%sp%s\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done + while $(GIT) rev-parse -q --verify $$($(CAT) VERSION) >/dev/null 2>&1; do $(PRINTF) "v%sp%s\n" $(VERSIONNO) $$($(EXPR) $(PATCHNO) + 1) >$<; done $(CAT) $< >$@ gitclean: -- 2.47.3