1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

common.mk: quote pipes on Windows

Browse Source 
* 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
This commit is contained in:
nobu 2017-10-26 01:36:52 +00:00
parent bbacbc96d6
commit 464cda55c5
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.mk
View File

@ -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' \