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

Revert "Preserve the directory structure under tool/ruby_vm/views"

Browse Source 
This reverts commit 62ec621f8c7457374d1f08aec97138ac1b7bdf2a.

will revisit this once fixing non-MJIT targets
This commit is contained in:
Takashi Kokubun 2022-09-18 14:21:23 +09:00
parent 62ec621f8c
commit 12023c833f
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
template/Makefile.in
View File

@ -505,7 +505,7 @@ clean-local::
-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) $(MJIT_HEADER_BUILD_DIR) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD) -$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) $(MJIT_HEADER_BUILD_DIR) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD)
main: $(srcdir)/lib/mjit/instruction.rb main: $(srcdir)/lib/mjit/instruction.rb
$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def $(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/instruction.rb.erb $(srcdir)/insns.def
$(ECHO) generating $@ $(ECHO) generating $@
$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@ $(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@

3
tool/ruby_vm/helpers/dumper.rb
View File

@ -25,11 +25,10 @@ class RubyVM::Dumper
end end
def new_erb spec def new_erb spec
srcdir = Pathname.new(__dir__).parent.parent.parent
path = Pathname.new(__FILE__) path = Pathname.new(__FILE__)
path = (path.relative_path_from(Pathname.pwd) rescue path).dirname path = (path.relative_path_from(Pathname.pwd) rescue path).dirname
path += '../views' path += '../views'
path += Pathname.pwd.join(spec).to_s.sub("#{srcdir}/", '') path += File.basename(spec)
src = path.read mode: 'rt:utf-8:utf-8' src = path.read mode: 'rt:utf-8:utf-8'
rescue Errno::ENOENT rescue Errno::ENOENT
raise "don't know how to generate #{path}" raise "don't know how to generate #{path}"

0
tool/ruby_vm/views/lib/mjit/instruction.rb.erb → tool/ruby_vm/views/instruction.rb.erb
View File