https://git.ruby-lang.org/ruby.git/commit/?id=13e9551b97

From 13e9551b97d6bb9fcd09283692f6090f4c418059 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Sun, 22 Mar 2020 23:15:50 -0700
Subject: Change the filename like make variable

for consistency

diff --git a/common.mk b/common.mk
index 46c2791..5d3e43b 100644
--- a/common.mk
+++ b/common.mk
@@ -227,9 +227,9 @@ MJIT_WITHOUT_TABS=true https://github.com/ruby/ruby/blob/trunk/common.mk#L227
 # Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb.
 # So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated.
 $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \
-		$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/run_without_tabs.rb
+		$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_without_tabs.rb
 	$(ECHO) building $(@F:.time=.h)
-	$(Q) $(BASERUBY) $(srcdir)/tool/run_without_tabs.rb "$(MJIT_WITHOUT_TABS)" \
+	$(Q) $(BASERUBY) $(srcdir)/tool/mjit_without_tabs.rb "$(MJIT_WITHOUT_TABS)" \
 		$(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
 	$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new
 
diff --git a/tool/mjit_without_tabs.rb b/tool/mjit_without_tabs.rb
new file mode 100644
index 0000000..bc2ca77
--- /dev/null
+++ b/tool/mjit_without_tabs.rb
@@ -0,0 +1,65 @@ https://github.com/ruby/ruby/blob/trunk/tool/mjit_without_tabs.rb#L1
+# frozen_string_literal: true
+# This is a script to run a command in ARGV, expanding tabs in some files
+# included by vm.c to normalize indentation of MJIT header. You can disable
+# this feature by setting MJIT_WITHOUT_TABS=false make variable.
+#
+# Note that preprocessor of GCC converts a hard tab to one spaces, where
+# we expect it to be shown as 8 spaces. To obviate this script, we need
+# to convert all tabs to spaces in these files.
+
+require 'fileutils'
+
+EXPAND_TARGETS = %w[
+  vm*.*
+  include/ruby/ruby.h
+]
+
+# These files have no hard tab indentations. Skip normalizing these files from the glob result.
+SKIPPED_FILES = %w[
+  vm_callinfo.h
+  vm_debug.h
+  vm_exec.h
+  vm_opts.h
+]
+
+srcdir = File.expand_path('..', __dir__)
+targets = EXPAND_TARGETS.flat_map { |t| Dir.glob(File.join(srcdir, t)) } - SKIPPED_FILES.map { |f| File.join(srcdir, f) }
+sources = {}
+mtimes = {}
+
+flag, *command = ARGV
+
+targets.each do |target|
+  next if flag != 'true'
+  unless File.writable?(target)
+    puts "tool/mjit_without_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}."
+    next
+  end
+
+  sources[target] = source
+  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."
+  end
+  File.write(target, expanded)
+  FileUtils.touch(target, mtime: mtimes[target])
+end
+
+result = system(*command)
+
+targets.each do |target|
+  if sources.key?(target)
+    File.write(target, sources[target])
+    FileUtils.touch(target, mtime: mtimes.fetch(target))
+  end
+end
+
+exit result
diff --git a/tool/run_without_tabs.rb b/tool/run_without_tabs.rb
deleted file mode 100644
index d1640c6..0000000
--- a/tool/run_without_tabs.rb
+++ /dev/null
@@ -1,65 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/tool/mjit_without_tabs.rb#L0
-# frozen_string_literal: true
-# This is a script to run a command in ARGV, expanding tabs in some files
-# included by vm.c to normalize indentation of MJIT header. You can disable
-# this feature by setting MJIT_WITHOUT_TABS=false make variable.
-#
-# Note that preprocessor of GCC converts a hard tab to one spaces, where
-# we expect it to be shown as 8 spaces. To obviate this script, we need
-# to convert all tabs to spaces in these files.
-
-require 'fileutils'
-
-EXPAND_TARGETS = %w[
-  vm*.*
-  include/ruby/ruby.h
-]
-
-# These files have no hard tab indentations. Skip normalizing these files from the glob result.
-SKIPPED_FILES = %w[
-  vm_callinfo.h
-  vm_debug.h
-  vm_exec.h
-  vm_opts.h
-]
-
-srcdir = File.expand_path('..', __dir__)
-targets = EXPAND_TARGETS.flat_map { |t| Dir.glob(File.join(srcdir, t)) } - SKIPPED_FILES.map { |f| File.join(srcdir, f) }
-sources = {}
-mtimes = {}
-
-flag, *command = ARGV
-
-targets.each do |target|
-  next if flag != 'true'
-  unless File.writable?(target)
-    puts "tool/run_without_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/run_without_tabs.rb: Skipping #{target.dump} as the encoding is #{source.encoding}."
-    next
-  end
-
-  sources[target] = source
-  mtimes[target] = File.mtime(target)
-
-  if sources[target] == expanded
-    puts "#{target.dump} has no hard tab indentation. This should be ignored in tool/run_without_tabs.rb."
-  end
-  File.write(target, expanded)
-  FileUtils.touch(target, mtime: mtimes[target])
-end
-
-result = system(*command)
-
-targets.each do |target|
-  if sources.key?(target)
-    File.write(target, sources[target])
-    FileUtils.touch(target, mtime: mtimes.fetch(target))
-  end
-end
-
-exit result
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/