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

Revert "Fix building with 1.8 BASERUBY"

Browse source 
This reverts commit 05bc14d81a.

We have decided that the cost of reintroducing support for 1.8
BASERUBY outweighs the benefit.  If you are still using 1.8 and want
to build master/trunk, build and install the latest release, and use
that as BASERUBY.
This commit is contained in:
Jeremy Evans 2019-05-29 17:58:18 -07:00
parent 5867e51e83
commit d2ba80b5df
4 changed files with 7 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
$(Q)$(BOOTSTRAPRUBY) -n \
-e 'BEGIN{VERSION=ARGV.shift;MIS=ARGV.dup}' \
-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 'BEGIN{version=ARGV.shift;mis=ARGV.dup}' \
-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' \
$(UNICODE_VERSION) $(UNICODE_DATA_HEADERS)
$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb \
-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \

2
tool/colorize.rb
View file

@ -4,7 +4,7 @@ class Colorize
def initialize(color = nil)
@colors = @reset = nil
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["
@colors = (colors = ENV['TEST_COLORS']) ? Hash[colors.scan(/(\w+)=([^:\n]*)/)] : {}
@reset = "#{@beg}m"

2
tool/downloader.rb
View file

@ -173,7 +173,7 @@ class Downloader
if cache_save
save_cache(cache, file, name)
end
return file.respond_to?(:to_path) ? file.to_path : file.to_s
return file.to_path
end
if dryrun
puts "Download #{url} into #{file}"

5
tool/generic_erb.rb
View file

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