ruby-changes:66385
From: Takashi <ko1@a...>
Date: Tue, 1 Jun 2021 14:56:54 +0900 (JST)
Subject: [ruby-changes:66385] 0d32a18f5b (master): Make --without-mjit-tabs work again
https://git.ruby-lang.org/ruby.git/commit/?id=0d32a18f5b From 0d32a18f5b8cb07ef766ac3ae6de6d41c95af43f Mon Sep 17 00:00:00 2001 From: Takashi Kokubun <takashikkbn@g...> Date: Mon, 31 May 2021 22:56:15 -0700 Subject: Make --without-mjit-tabs work again vm_sync.{c,h} don't have tabs --- tool/mjit_tabs.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tool/mjit_tabs.rb b/tool/mjit_tabs.rb index 8b91af2..edcbf6c 100644 --- a/tool/mjit_tabs.rb +++ b/tool/mjit_tabs.rb @@ -20,6 +20,8 @@ SKIPPED_FILES = %w[ https://github.com/ruby/ruby/blob/trunk/tool/mjit_tabs.rb#L20 vm_debug.h vm_exec.h vm_opts.h + vm_sync.h + vm_sync.c ] srcdir = File.expand_path('..', __dir__) @@ -32,14 +34,14 @@ mjit_tabs, *command = ARGV https://github.com/ruby/ruby/blob/trunk/tool/mjit_tabs.rb#L34 targets.each do |target| next if mjit_tabs != 'false' unless File.writable?(target) - puts "tool/mjit_without_tabs.rb: Skipping #{target.dump} as it's not writable." + puts "tool/mjit_tabs.rb: Skipping #{target.dump} as it's not writable." next end source = File.read(target) begin expanded = source.gsub(/^\t+/) { |tab| ' ' * 8 * tab.length } rescue ArgumentError # invalid byte sequence in UTF-8 (Travis, RubyCI) - puts "tool/mjit_without_tabs.rb: Skipping #{target.dump} as the encoding is #{source.encoding}." + puts "tool/mjit_tabs.rb: Skipping #{target.dump} as the encoding is #{source.encoding}." next end @@ -47,7 +49,7 @@ targets.each do |target| https://github.com/ruby/ruby/blob/trunk/tool/mjit_tabs.rb#L49 mtimes[target] = File.mtime(target) if sources[target] == expanded - puts "#{target.dump} has no hard tab indentation. This should be ignored in tool/mjit_without_tabs.rb." + puts "#{target.dump} has no hard tab indentation. This should be ignored in tool/mjit_tabs.rb." end File.write(target, expanded) FileUtils.touch(target, mtime: mtimes[target]) -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/