kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

rbinstall.rb: fix timing to read stub

Browse source 
* tool/rbinstall.rb ($script_installer.stub): read stub file on
  demand.  as `$cmdtype` is set to "exe" in parse_args, it is not
  set yet when `$script_installer` is defined.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63268 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-27 01:58:29 +00:00
parent c03f86b389
commit 9ce0a84640
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tool/rbinstall.rb
View file

@ -455,14 +455,11 @@ _=_\\
#{prolog_script}=end #{prolog_script}=end
EOS EOS
$script_installer = Struct.new(:ruby_shebang, :ruby_bin, :ruby_install_name, installer = Struct.new(:ruby_shebang, :ruby_bin, :ruby_install_name, :stub, :trans)
:stub, :trans) do $script_installer = Class.new(installer) do
ruby_shebang = File.join(bindir, ruby_install_name) ruby_shebang = File.join(bindir, ruby_install_name)
if File::ALT_SEPARATOR if File::ALT_SEPARATOR
ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR) ruby_bin = ruby_shebang.tr(File::SEPARATOR, File::ALT_SEPARATOR)
if $cmdtype == 'exe'
stub = File.open("rubystub.exe", "rb") {|f| f.read} << "\n" rescue nil
end
end end
if trans = CONFIG["program_transform_name"] if trans = CONFIG["program_transform_name"]
exp = [] exp = []
@ -523,7 +520,20 @@ $script_installer = Struct.new(:ruby_shebang, :ruby_bin, :ruby_install_name,
end end
end end
break new(ruby_shebang, ruby_bin, ruby_install_name, stub, trans) def self.get_rubystub
stubfile = "rubystub.exe"
stub = File.open(stubfile, "rb") {|f| f.read} << "\n"
rescue => e
abort "No #{stubfile}: #{e}"
else
stub
end
def stub
super or self.stub = self.class.get_rubystub
end
break new(ruby_shebang, ruby_bin, ruby_install_name, nil, trans)
end end
install?(:local, :comm, :bin, :'bin-comm') do install?(:local, :comm, :bin, :'bin-comm') do