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

* tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.

* lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.

* test/ruby/envutil.rb: ditto.

* benchmark/report.rb: ditto.

* benchmark/runc.rb: ditto.

* tool/eval.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26216 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-12-31 15:00:04 +00:00
parent 070489975d
commit c0b4e90f08
7 changed files with 27 additions and 16 deletions

View file

@ -1,3 +1,17 @@
Thu Jan 1 00:00:00 2010 Tanaka Akira <akr@fsij.org>
* tool/mkconfig.rb: generate RbConfig.ruby in rbconfig.rb.
* lib/webrick/httpservlet/cgihandler.rb: use RbConfig.ruby.
* test/ruby/envutil.rb: ditto.
* benchmark/report.rb: ditto.
* benchmark/runc.rb: ditto.
* tool/eval.rb: ditto.
Thu Dec 31 18:18:55 2009 NAKAMURA Usaku <usa@ruby-lang.org>
* ext/socket/rubysocket.h: include addrinfo.h only when using our own

View file

@ -24,9 +24,7 @@ def exec_command type, file, w
end
def benchmark cmd
rubybin = ENV['RUBY'] || File.join(
RbConfig::CONFIG["bindir"],
RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
rubybin = ENV['RUBY'] || RbConfig.ruby
IO.popen(rubybin, 'r+'){|io|
io.write cmd

View file

@ -5,9 +5,7 @@
require 'benchmark'
require 'rbconfig'
$rubybin = ENV['RUBY'] || File.join(
RbConfig::CONFIG["bindir"],
RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
$rubybin = ENV['RUBY'] || RbConfig.ruby
def runfile file
puts file

View file

@ -17,9 +17,7 @@ module WEBrick
module HTTPServlet
class CGIHandler < AbstractServlet
Ruby = File::join(RbConfig::CONFIG['bindir'],
RbConfig::CONFIG['ruby_install_name'])
Ruby << RbConfig::CONFIG['EXEEXT']
Ruby = RbConfig.ruby
CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\""
def initialize(server, name)

View file

@ -22,10 +22,7 @@ module EnvUtil
end
begin
require "rbconfig"
File.join(
RbConfig::CONFIG["bindir"],
RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
)
RbConfig.ruby
rescue LoadError
"ruby"
end

View file

@ -3,9 +3,7 @@ require 'rbconfig'
require 'fileutils'
require 'pp'
Ruby = ENV['RUBY'] ||
File.join(RbConfig::CONFIG["bindir"],
RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"])
Ruby = ENV['RUBY'] || RbConfig.ruby
#
OPTIONS = %w{

View file

@ -201,6 +201,14 @@ print <<EOS
CONFIG.each_value do |val|
RbConfig::expand(val)
end
# returns the absolute pathname of the ruby command.
def RbConfig.ruby
File.join(
RbConfig::CONFIG["bindir"],
RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
)
end
end
Config = RbConfig # compatibility for ruby-1.8.4 and older.
CROSS_COMPILING = nil unless defined? CROSS_COMPILING