summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk32
1 files changed, 19 insertions, 13 deletions
diff --git a/common.mk b/common.mk
index ea2e0c919d..d449a3e90d 100644
--- a/common.mk
+++ b/common.mk
@@ -1568,13 +1568,14 @@ update-bundled_gems: PHONY
$(GIT) -C "$(srcdir)" diff --no-ext-diff --ignore-submodules --exit-code || \
$(GIT) -C "$(srcdir)" commit -m "Update bundled_gems" gems/bundled_gems
-PRECHECK_BUNDLED_GEMS = test-bundled-gems-precheck
+PRECHECK_BUNDLED_GEMS = yes
test-bundled-gems-precheck: $(TEST_RUNNABLE)-test-bundled-gems-precheck
-yes-test-bundled-gems-precheck: main
+yes-test-bundled-gems-precheck: $(PRECHECK_BUNDLED_GEMS:yes=main)
no-test-bundled-gems-precheck:
-update-default-gemspecs: main
- $(ACTIONS_GROUP)
+update-default-gemspecs: $(TEST_RUNNABLE)-update-default-gemspecs
+no-update-default-gemspecs:
+yes-update-default-gemspecs: $(PRECHECK_BUNDLED_GEMS:yes=main)
@$(MAKEDIRS) $(srcdir)/.bundle/specifications
@$(XRUBY) -W0 -C "$(srcdir)" -rrubygems \
-e "destdir = ARGV.shift" \
@@ -1593,27 +1594,32 @@ update-default-gemspecs: main
-e "end" \
-e "end" \
-- .bundle/specifications lib ext
- $(ACTIONS_ENDGROUP)
-install-for-test-bundled-gems: update-default-gemspecs
- $(ACTIONS_GROUP)
+install-for-test-bundled-gems: $(TEST_RUNNABLE)-install-for-test-bundled-gems
+no-install-for-test-bundled-gems: no-update-default-gemspecs
+yes-install-for-test-bundled-gems: yes-update-default-gemspecs
$(XRUBY) -C "$(srcdir)" -r./tool/lib/gem_env.rb bin/gem \
install --no-document --conservative \
"hoe" "json-schema" "test-unit-rr" "simplecov" "simplecov-html" "simplecov-json"
- $(ACTIONS_ENDGROUP)
test-bundled-gems-fetch: yes-test-bundled-gems-fetch
yes-test-bundled-gems-fetch:
- $(ACTIONS_GROUP)
$(Q) $(BASERUBY) -C $(srcdir)/gems ../tool/fetch-bundled_gems.rb BUNDLED_GEMS="$(BUNDLED_GEMS)" src bundled_gems
- $(ACTIONS_ENDGROUP)
no-test-bundled-gems-fetch:
-test-bundled-gems-prepare: $(PRECHECK_BUNDLED_GEMS) test-bundled-gems-fetch
test-bundled-gems-prepare: $(TEST_RUNNABLE)-test-bundled-gems-prepare
no-test-bundled-gems-prepare: no-test-bundled-gems-precheck no-test-bundled-gems-fetch
-yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck yes-test-bundled-gems-fetch
-yes-test-bundled-gems-prepare: install-for-test-bundled-gems
+Preparing-test-bundled-gems:
+ $(ACTIONS_GROUP)
+yes-test-bundled-gems-prepare: Preparing-test-bundled-gems $(DOT_WAIT)
+ $(ACTIONS_ENDGROUP)
+yes-test-bundled-gems-prepare: yes-test-bundled-gems-precheck $(DOT_WAIT)
+yes-test-bundled-gems-prepare: yes-install-for-test-bundled-gems $(DOT_WAIT)
+yes-test-bundled-gems-prepare: yes-test-bundled-gems-fetch $(DOT_WAIT)
+yes-test-bundled-gems-precheck: Preparing-test-bundled-gems
+yes-install-for-test-bundled-gems: Preparing-test-bundled-gems
+yes-test-bundled-gems-fetch: Preparing-test-bundled-gems
+
PREPARE_BUNDLED_GEMS = test-bundled-gems-prepare
test-bundled-gems: $(TEST_RUNNABLE)-test-bundled-gems $(DOT_WAIT) $(TEST_RUNNABLE)-test-bundled-gems-spec