[前][次][番号順一覧][スレッド一覧]

ruby-changes:60373

From: Nobuyoshi <ko1@a...>
Date: Thu, 12 Mar 2020 22:58:39 +0900 (JST)
Subject: [ruby-changes:60373] 289bdb64d9 (master): Add prepare-gems to download and extract bundled gems

https://git.ruby-lang.org/ruby.git/commit/?id=289bdb64d9

From 289bdb64d97a4a7eb626ce6ebc4e609d4bdc0ee0 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 12 Mar 2020 22:58:04 +0900
Subject: Add prepare-gems to download and extract bundled gems


diff --git a/common.mk b/common.mk
index b2cb7da..0742cbc 100644
--- a/common.mk
+++ b/common.mk
@@ -1273,7 +1273,8 @@ update-config_files: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1273
 	$(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 bde5a8f..b9b16e3 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -243,14 +243,13 @@ HELP_EXTRA_TASKS = \ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L243
 	"  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
 
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]