diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-03-03 00:55:45 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2024-03-03 00:55:45 +0900 |
commit | e9a7801a938a6e4e0d071dec05e1ecdb99606bbf (patch) | |
tree | e128c0c658cedbf11153c92ec338adcea31e0555 /enc/make_encmake.rb | |
parent | 71d511615b8dac459d6f88f5896b9859f99c999e (diff) |
Drop support for old ERB
Diffstat (limited to 'enc/make_encmake.rb')
-rwxr-xr-x | enc/make_encmake.rb | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index fcfc2c9267..a0bf4be969 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -121,11 +121,7 @@ ENCS, ENC_DEPS = target_encodings ATRANS, TRANS = target_transcoders if File.exist?(depend = File.join($srcdir, "depend")) - if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ - erb = ERB.new(File.read(depend), trim_mode: '%') - else - erb = ERB.new(File.read(depend), nil, '%') - end + erb = ERB.new(File.read(depend), trim_mode: '%') erb.filename = depend tmp = erb.result(binding) dep = "\n#### depend ####\n\n" << depend_rules(tmp).join @@ -139,11 +135,7 @@ File.open(ARGV[0], 'wb') {|f| } if MODULE_TYPE == :static filename = "encinit.c.erb" - if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+ - erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') - else - erb = ERB.new(File.read(File.join($srcdir, filename)), nil, '%-') - end + erb = ERB.new(File.read(File.join($srcdir, filename)), trim_mode: '%-') erb.filename = "enc/#{filename}" tmp = erb.result(binding) begin |