Preserve the directory structure under tool/ruby_vm/views

for nested target directories
ruby · Sep 18, 2022 · 62ec621 · 62ec621
1 parent 0e816e6
commit 62ec621
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/template/Makefile.in b/template/Makefile.in
@@ -505,7 +505,7 @@ clean-local::
 	-$(Q) $(RMDIRS) $(MJIT_HEADER_INSTALL_DIR) $(MJIT_HEADER_BUILD_DIR) $(TIMESTAMPDIR) 2> $(NULL) || $(NULLCMD)
 
 main: $(srcdir)/lib/mjit/instruction.rb
-$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/instruction.rb.erb $(srcdir)/insns.def
+$(srcdir)/lib/mjit/instruction.rb: $(tooldir)/ruby_vm/views/lib/mjit/instruction.rb.erb $(srcdir)/insns.def
 	$(ECHO) generating $@
 	$(Q) $(BASERUBY) -Ku $(tooldir)/insns2vm.rb $(INSNS2VMOPT) $@
 

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

diff --git a/tool/ruby_vm/views/instruction.rb.erb → ...ruby_vm/views/lib/mjit/instruction.rb.erb b/tool/ruby_vm/views/instruction.rb.erb → ...ruby_vm/views/lib/mjit/instruction.rb.erb