summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2020-03-12 22:58:04 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2020-03-12 22:58:04 +0900
commit289bdb64d97a4a7eb626ce6ebc4e609d4bdc0ee0 (patch)
tree5cda47a3e4fe6e20c73d2d320cb128f55cbd7430
parentde10631dcf6dc4ddf5d869a8f9a7dd2ff6a749c6 (diff)
Add prepare-gems to download and extract bundled gems
-rw-r--r--common.mk3
-rw-r--r--defs/gmake.mk9
2 files changed, 6 insertions, 6 deletions
diff --git a/common.mk b/common.mk
index b2cb7dad7c..0742cbc9c7 100644
--- a/common.mk
+++ b/common.mk
@@ -1273,7 +1273,8 @@ update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)" tool/downloader.rb -d tool --cache-dir=$(CACHE_DIR) -e gnu \
config.guess config.sub
-refresh-gems: update-bundled_gems update-gems extract-gems
+refresh-gems: update-bundled_gems prepare-gems
+prepare-gems: update-gems extract-gems
update-gems: PHONY
$(ECHO) Downloading bundled gem files...
diff --git a/defs/gmake.mk b/defs/gmake.mk
index bde5a8f782..b9b16e3744 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -243,14 +243,13 @@ HELP_EXTRA_TASKS = \
" update-github: merge master branch and push it to Pull Request [PR=1234]" \
""
-ifneq ($(filter refresh-gems,$(MAKECMDGOALS)),)
+ifneq ($(filter extract-gems refresh-gems prepare-gems,$(MAKECMDGOALS)),)
extract-gems: update-gems
-update-gems: update-bundled_gems
endif
-ifneq ($(filter extract-gems,$(MAKECMDGOALS)),)
-extract-gems: $(filter update-gems update-bundled_gems,$(MAKECMDGOALS))
+ifneq ($(filter refresh-gems,$(MAKECMDGOALS)),)
+update-gems: update-bundled_gems
endif
-ifneq ($(filter update-gems,$(MAKECMDGOALS)),)
+ifneq ($(filter update-gems prepare-gems,$(MAKECMDGOALS)),)
update-gems: $(filter update-bundled_gems,$(MAKECMDGOALS))
endif