diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 01:36:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-10-26 01:36:52 +0000 |
| commit | 4c02162883111b8a581ac9af1eea84d5db42631a (patch) | |
| tree | f6cbcfa8a2695a8faaa17033c68a4921fba94d04 /common.mk | |
| parent | 83c530fb4c58c510239b67e51fc1d094d1426e91 (diff) | |
| download | ruby-4c02162883111b8a581ac9af1eea84d5db42631a.tar.gz | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@60436 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -263,7 +263,7 @@ $(CAPIOUT)/.timestamp: Doxyfile $(PREP) $(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 -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 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' \ |