diff --git a/tool/ruby_vm/controllers/application_controller.rb b/tool/ruby_vm/controllers/application_controller.rb index bb86873d25..65783513e7 100644 --- a/tool/ruby_vm/controllers/application_controller.rb +++ b/tool/ruby_vm/controllers/application_controller.rb @@ -16,9 +16,10 @@ require_relative '../models/typemap' require_relative '../loaders/vm_opts_h' class ApplicationController - def generate i + def generate i, destdir path = Pathname.new i - dumper = RubyVM::Dumper.new i + dst = Pathname.new(destdir).join(i) + dumper = RubyVM::Dumper.new dst return [path, dumper] end end diff --git a/tool/ruby_vm/helpers/dumper.rb b/tool/ruby_vm/helpers/dumper.rb index 2d6bb269f6..b622b898b9 100644 --- a/tool/ruby_vm/helpers/dumper.rb +++ b/tool/ruby_vm/helpers/dumper.rb @@ -80,11 +80,9 @@ class RubyVM::Dumper . join end - def initialize path + def initialize dst @erb = {} @empty = new_binding - dst = Pathname.new Dir.getwd - dst += path @file = cstr dst.realdirpath.to_path end diff --git a/tool/ruby_vm/scripts/insns2vm.rb b/tool/ruby_vm/scripts/insns2vm.rb index f76ba2322f..a04394ab27 100644 --- a/tool/ruby_vm/scripts/insns2vm.rb +++ b/tool/ruby_vm/scripts/insns2vm.rb @@ -14,13 +14,14 @@ require 'optparse' require_relative '../controllers/application_controller.rb' def router argv - targets = generate_parser.parse argv + options = { destdir: Dir.getwd } + targets = generate_parser(options).parse argv return targets.map do |i| - next ApplicationController.new.generate i + next ApplicationController.new.generate i, options[:destdir] end end -def generate_parser +def generate_parser(options) OptionParser.new do |this| this.on "-I", "--srcdir=DIR", <<-'end' Historically this option has been passed to the script. This is @@ -78,7 +79,8 @@ def generate_parser THIS IS THE ONLY OPTION THAT WORKS today. Change destination directory from the current working directory to the given path. begin - Dir.chdir dir + raise "directory was not found in '#{dir}'" unless Dir.eixst?(dir) + options[:destdir] = dir end this.on "-V", "--[no-]verbose", <<-'end'