1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Expand tabs for rb_mjit_header.h"

Browse Source 
This reverts commit 57119dd561418c917b885db5f5af7f129a96d1ec.

Temporarily reverting for Travis failures
This commit is contained in:
Takashi Kokubun 2020-03-22 00:53:05 -07:00
parent 57119dd561
commit 91acdd17c4
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
2 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common.mk
View File

@ -224,10 +224,9 @@ mjit_config.h: Makefile
# 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
$(ECHO) building $(@F:.time=.h)
$(Q) $(BASERUBY) $(srcdir)/tool/run_without_tabs.rb \
$(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
$(Q) $(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
$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).h: $(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time

35
tool/run_without_tabs.rb
View File

@ -1,35 +0,0 @@
# 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.
#
# 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'
srcdir = File.expand_path('..', __dir__)
targets = Dir.glob(File.join(srcdir, 'vm*.*'))
sources = {}
mtimes = {}
targets.each do |target|
sources[target] = File.read(target)
mtimes[target] = File.mtime(target)
expanded = sources[target].gsub(/^\t+/) { |tab| ' ' * 8 * tab.length }
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(*ARGV)
targets.each do |target|
File.write(target, sources.fetch(target))
FileUtils.touch(target, mtime: mtimes.fetch(target))
end
exit result