ruby-changes:48322
From: nobu <ko1@a...>
Date: Thu, 26 Oct 2017 10:36:57 +0900 (JST)
Subject: [ruby-changes:48322] nobu:r60436 (trunk): common.mk: quote pipes on Windows
nobu 2017-10-26 10:36:52 +0900 (Thu, 26 Oct 2017) New Revision: 60436 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=60436 Log: common.mk: quote pipes on Windows * common.mk (update-gems, update-bundled_gems): quote pipes by double qoutes instead of single quotes, to escape them on Windows. wildcard characters `*?[{` still need to be quoted by single quotes to get rid of globbing. Modified files: trunk/common.mk Index: common.mk =================================================================== --- common.mk (revision 60435) +++ common.mk (revision 60436) @@ -263,7 +263,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L263 $(Q) $(MAKEDIRS) "$(@D)" $(ECHO) generating capi -$(Q) $(DOXYGEN) -b - $(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){|f| f.puts(Time.now)}' "$@" + $(Q) $(MINIRUBY) -e 'File.open(ARGV[0], "w"){'"|f|"' f.puts(Time.now)}' "$@" Doxyfile: $(srcdir)/template/Doxyfile.tmpl $(PREP) $(srcdir)/tool/generic_erb.rb $(RBCONFIG) $(ECHO) generating $@ @@ -1135,7 +1135,8 @@ update-gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1135 -e 'gem = "#{gem}-#{ver}.gem"' \ -e 'Downloader::RubyGems.download(gem, "gems", nil) and' \ -e 'old.delete("gems/#{gem}") and' \ - -e 'File.unlink(*old) and FileUtils.rm_rf(old.map{|n|n.chomp(".gem")})' \ + -e 'File.unlink(*old) and' \ + -e 'FileUtils.rm_rf(old.map{'"|n|"'n.chomp(".gem")})' \ gems/bundled_gems extract-gems: PHONY @@ -1149,7 +1150,7 @@ extract-gems: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1150 update-bundled_gems: PHONY $(Q) $(RUNRUBY) -rrubygems \ -pla \ - -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {|s|' \ + -e '$$_=Gem::SpecFetcher.fetcher.detect(:latest) {'"|s|" \ -e 'if s.platform=="ruby"&&s.name==$$F[0]' \ -e 'break [s.name, s.version, *$$F[2..-1]].join(" ")' \ -e 'end' \ -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/