kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Fix building with 1.8 BASERUBY

Browse source
This commit is contained in:
Jeremy Evans 2019-05-27 20:54:20 -07:00
parent f3bddc103d
commit 05bc14d81a
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common.mk
View file

@ -785,9 +785,9 @@ extconf: $(PREP)
$(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
$(Q)$(BOOTSTRAPRUBY) -n \ $(Q)$(BOOTSTRAPRUBY) -n \
-e 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \ -e 'BEGIN{VERSION=ARGV.shift;MIS=ARGV.dup}' \
-e 'END{abort "UNICODE version mismatch: #{mis}" unless mis.empty?}' \ -e 'END{abort "UNICODE version mismatch: #{MIS}" unless MIS.empty?}' \
-e '(mis.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(version)}"/o' \ -e '(MIS.delete(ARGF.path); ARGF.close) if /ONIG_UNICODE_VERSION_STRING +"#{Regexp.quote(VERSION)}"/o' \
$(UNICODE_VERSION) $(UNICODE_DATA_HEADERS) $(UNICODE_VERSION) $(UNICODE_DATA_HEADERS)
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \ $(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \ -arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \

2
tool/colorize.rb
View file

@ -4,7 +4,7 @@ class Colorize
def initialize(color = nil) def initialize(color = nil)
@colors = @reset = nil @colors = @reset = nil
if color or (color == nil && STDOUT.tty?) if color or (color == nil && STDOUT.tty?)
if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", err: IO::NULL, &:read) rescue nil) if (/\A\e\[.*m\z/ =~ IO.popen("tput smso", "r", :err => IO::NULL, &:read) rescue nil)
@beg = "\e[" @beg = "\e["
@colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {} @colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
@reset = "#{@beg}m" @reset = "#{@beg}m"

4
tool/downloader.rb
View file

@ -1,4 +1,4 @@
# Used by configure and make to download or update mirrored Ruby and GCC #6 Used by configure and make to download or update mirrored Ruby and GCC
# files. This will use HTTPS if possible, falling back to HTTP. # files. This will use HTTPS if possible, falling back to HTTP.
require 'fileutils' require 'fileutils'
@ -173,7 +173,7 @@ class Downloader
if cache_save if cache_save
save_cache(cache, file, name) save_cache(cache, file, name)
end end
return file.to_path return file.respond_to?(:to_path) ? file.to_path : file.to_s
end end
if dryrun if dryrun
puts "Download #{url} into #{file}" puts "Download #{url} into #{file}"

5
tool/generic_erb.rb
View file

@ -33,8 +33,9 @@ unchanged = color.pass("unchanged")
updated = color.fail("updated") updated = color.fail("updated")
result = templates.map do |template| result = templates.map do |template|
if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ method = ERB.instance_method(:initialize)
erb = ERB.new(File.read(template), trim_mode: '%-') if method.respond_to?(:parameters) && method.parameters.assoc(:key) # Ruby 2.6+
erb = ERB.new(File.read(template), :trim_mode => '%-')
else else
erb = ERB.new(File.read(template), nil, '%-') erb = ERB.new(File.read(template), nil, '%-')
end end