ruby-changes:63841
From: Nobuyoshi <ko1@a...>
Date: Wed, 2 Dec 2020 17:24:34 +0900 (JST)
Subject: [ruby-changes:63841] 44f038bd7f (master): gmake.mk: renamed BUNDLED_GEMS as bundled-gems
https://git.ruby-lang.org/ruby.git/commit/?id=44f038bd7f From 44f038bd7f8371011722ef3531a13d054e541fa2 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Wed, 2 Dec 2020 17:04:33 +0900 Subject: gmake.mk: renamed BUNDLED_GEMS as bundled-gems Hyphenated names are safe in GNU make. diff --git a/defs/gmake.mk b/defs/gmake.mk index a6d5617..f093fd4 100644 --- a/defs/gmake.mk +++ b/defs/gmake.mk @@ -248,9 +248,9 @@ HELP_EXTRA_TASKS = \ https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L248 extract-gems: $(HAVE_BASERUBY:yes=update-gems) -BUNDLED_GEMS := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems) +bundled-gems := $(shell sed '/^[ ]*\#/d;/^[ ]*$$/d;s/[ ][ ]*/-/;s/[ ].*//' $(srcdir)/gems/bundled_gems) -update-gems: | $(patsubst %,gems/%.gem,$(BUNDLED_GEMS)) +update-gems: | $(patsubst %,gems/%.gem,$(bundled-gems)) test-bundler-precheck: | $(srcdir)/.bundle/cache @@ -269,7 +269,7 @@ gems/%.gem: https://github.com/ruby/ruby/blob/trunk/defs/gmake.mk#L269 -e 'File.unlink(*old) and' \ -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' -extract-gems: | $(patsubst %,.bundle/gems/%,$(BUNDLED_GEMS)) +extract-gems: | $(patsubst %,.bundle/gems/%,$(bundled-gems)) .bundle/gems/%: gems/%.gem | .bundle/gems $(ECHO) Extracting bundle gem $*... -- cgit v0.10.2 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/