1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Split commit recipe and pass more macros

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2023-09-11 11:04:33 +09:00
parent b8d0ab80bb
commit 2cc32ad67c
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
defs/gmake.mk
View File

@ -193,15 +193,22 @@ $(SCRIPTBINDIR):
$(Q) mkdir $@ $(Q) mkdir $@
.PHONY: commit .PHONY: commit
commit: $(if $(filter commit,$(MAKECMDGOALS)),$(filter-out commit,$(MAKECMDGOALS))) up COMMIT_PREPARE := $(filter-out commit do-commit,$(MAKECMDGOALS)) up
commit: pre-commit $(DOT_WAIT) do-commit $(DOT_WAIT) post_commit
pre-commit: $(COMMIT_PREPARE)
do-commit: $(if $(DOT_WAIT),,pre-commit)
@$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit' @$(BASERUBY) -C "$(srcdir)" -I./tool/lib -rvcs -e 'VCS.detect(".").commit'
post-commit: $(if $(DOT_WAIT),,do-commit)
+$(Q) \ +$(Q) \
{ \ { \
$(in-srcdir) \ $(in-srcdir) \
exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \ exec sed -f tool/prereq.status defs/gmake.mk template/Makefile.in common.mk; \
} | \ } | \
$(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \ $(MAKE) $(mflags) Q=$(Q) ECHO=$(ECHO) \
BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" \ top_srcdir="$(top_srcdir)" srcdir="$(srcdir)" srcs_vpath="" CHDIR="$(CHDIR)" \
BOOTSTRAPRUBY="$(BOOTSTRAPRUBY)" BOOTSTRAPRUBY_OPT="$(BOOTSTRAPRUBY_OPT)" \
MINIRUBY="$(BASERUBY)" BASERUBY="$(BASERUBY)" HAVE_BASERUBY="$(HAVE_BASERUBY)" \
VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \ VCSUP="" ENC_MK=.top-enc.mk REVISION_FORCE=PHONY CONFIGURE="$(CONFIGURE)" -f - \
update-src srcs all-incs update-src srcs all-incs