diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-31 15:00:04 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-12-31 15:00:04 +0000 |
| commit | c0b4e90f08a188430c17e5668603704906292088 () | |
| tree | 58e30bf59b341acc68d9d6358f8e5ab702da6bb7 | |
| parent | 070489975d3a61aeebeedbc5a53d9a99197ca984 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | benchmark/report.rb | 4 | ||||
| -rw-r--r-- | benchmark/runc.rb | 4 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/cgihandler.rb | 4 | ||||
| -rw-r--r-- | test/ruby/envutil.rb | 5 | ||||
| -rwxr-xr-x | tool/eval.rb | 4 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 8 |
7 files changed, 27 insertions, 16 deletions
@@ -1,3 +1,17 @@ Thu Dec 31 18:18:55 2009 NAKAMURA Usaku <[email protected]> * ext/socket/rubysocket.h: include addrinfo.h only when using our own @@ -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"]) IO.popen(rubybin, 'r+'){|io| io.write cmd @@ -5,9 +5,7 @@ require 'benchmark' require 'rbconfig' -$rubybin = ENV['RUBY'] || File.join( - RbConfig::CONFIG["bindir"], - RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]) def runfile file puts 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'] CGIRunner = "\"#{Ruby}\" \"#{WEBrick::Config::LIBDIR}/httpservlet/cgi_runner.rb\"" def initialize(server, name) @@ -22,10 +22,7 @@ module EnvUtil end begin require "rbconfig" - File.join( - RbConfig::CONFIG["bindir"], - RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"] - ) rescue LoadError "ruby" end @@ -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"]) # OPTIONS = %w{ @@ -201,6 +201,14 @@ print <<EOS CONFIG.each_value do |val| RbConfig::expand(val) end end Config = RbConfig # compatibility for ruby-1.8.4 and older. CROSS_COMPILING = nil unless defined? CROSS_COMPILING |