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

ruby-changes:58379

From: Nobuyoshi <ko1@a...>
Date: Thu, 24 Oct 2019 01:44:19 +0900 (JST)
Subject: [ruby-changes:58379] f1d4216bd9 (master): Added refresh-gems

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

From f1d4216bd9b89835a8aa7b4e087549dc35279a7f Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Thu, 24 Oct 2019 01:42:31 +0900
Subject: Added refresh-gems

Refreshes bundled gems to the latest version, and extracts them.

diff --git a/common.mk b/common.mk
index 773f3f5..d44a62e 100644
--- a/common.mk
+++ b/common.mk
@@ -1243,6 +1243,8 @@ update-config_files: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1243
 	$(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
+
 update-gems: PHONY
 	$(ECHO) Downloading bundled gem files...
 	$(Q) $(BASERUBY) -C "$(srcdir)" \
diff --git a/defs/gmake.mk b/defs/gmake.mk
index 120fba1..cecc212 100644
--- a/defs/gmake.mk
+++ b/defs/gmake.mk
@@ -241,8 +241,15 @@ HELP_EXTRA_TASKS = \ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L241
 	"  update-github:       merge master branch and push it to Pull Request [PR=1234]" \
 	""
 
-ifeq ($(words $(filter update-gems extract-gems,$(MAKECMDGOALS))),2)
+ifneq ($(filter refresh-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))
+endif
+ifneq ($(filter update-gems,$(MAKECMDGOALS)),)
+update-gems: $(filter update-bundled_gems,$(MAKECMDGOALS))
 endif
 
 ifeq ($(filter 0 1,$(words $(arch_flags))),)
-- 
cgit v0.10.2


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

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