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

* mkconfig.rb: generate RbConfig instead of Config.

Browse source 
* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
  ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
  lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
  lib/webrick/httpservlet/cgihandler.rb,
  test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
  test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
  test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
  win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
  Config.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2006-02-20 08:34:53 +00:00
parent 2d956bea23
commit 04946de81b
20 changed files with 70 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
Mon Feb 20 17:29:50 2006 Tanaka Akira <akr@m17n.org>
* mkconfig.rb: generate RbConfig instead of Config.
* instruby.rb, rubytest.rb, runruby.rb, bcc32/Makefile.sub,
ext/extmk.rb, ext/dl/extconf.rb, ext/iconv/charset_alias.rb,
lib/mkmf.rb, lib/rdoc/ri/ri_paths.rb,
lib/webrick/httpservlet/cgihandler.rb,
test/dbm/test_dbm.rb, test/gdbm/test_gdbm.rb,
test/ruby/envutil.rb, test/soap/calc/test_calc_cgi.rb,
test/soap/header/test_authheader_cgi.rb, test/soap/ssl/test_ssl.rb,
win32/mkexports.rb, win32/resource.rb: Use RbConfig instead of
Config.
Mon Feb 20 13:46:19 2006 NAKAMURA Usaku <usa@ruby-lang.org> Mon Feb 20 13:46:19 2006 NAKAMURA Usaku <usa@ruby-lang.org>
* lib/find.rb: should raise ENOENT if root entry does not exist, * lib/find.rb: should raise ENOENT if root entry does not exist,

2
bcc32/Makefile.sub
View file

@ -442,7 +442,7 @@ $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc: rbconfig.rb
post-install-ext:: post-install-ext::
$(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \ $(MINIRUBY) -I$(srcdir)lib -rrbconfig -rfileutils \
-e "FileUtils.rm_f(Dir[ARGV[0]+Config::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)" -e "FileUtils.rm_f(Dir[ARGV[0]+RbConfig::CONFIG['archdir']+'/**/*.tds'])" "$(DESTDIR:\=/)"
clean-local:: clean-local::
@$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib @$(RM) ext\extinit.c ext\extinit.$(OBJEXT) *.tds *.il? $(RUBY_SO_NAME).lib

2
ext/dl/extconf.rb
View file

@ -1,6 +1,6 @@
require 'mkmf' require 'mkmf'
if( Config::CONFIG['CC'] =~ /gcc/ ) if( RbConfig::CONFIG['CC'] =~ /gcc/ )
$CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer" $CFLAGS << " -fno-defer-pop -fno-omit-frame-pointer"
end end

18
ext/extmk.rb
View file

@ -64,7 +64,7 @@ def extract_makefile(makefile, keep = true)
unless installrb.empty? unless installrb.empty?
config = CONFIG.dup config = CONFIG.dup
install_dirs(target_prefix).each {|var, val| config[var] = val} install_dirs(target_prefix).each {|var, val| config[var] = val}
FileUtils.rm_f(installrb.values.collect {|f| Config.expand(f, config)}, verbose: true) FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, verbose: true)
end end
end end
return false return false
@ -116,9 +116,9 @@ def extmake(target)
makefile = "./Makefile" makefile = "./Makefile"
ok = File.exist?(makefile) ok = File.exist?(makefile)
unless $ignore unless $ignore
Config::CONFIG["hdrdir"] = $hdrdir RbConfig::CONFIG["hdrdir"] = $hdrdir
Config::CONFIG["srcdir"] = $srcdir RbConfig::CONFIG["srcdir"] = $srcdir
Config::CONFIG["topdir"] = $topdir RbConfig::CONFIG["topdir"] = $topdir
CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1] CONFIG["hdrdir"] = ($hdrdir == top_srcdir) ? top_srcdir : "$(topdir)"+top_srcdir[2..-1]
CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}" CONFIG["srcdir"] = "$(hdrdir)/ext/#{$mdir}"
CONFIG["topdir"] = $topdir CONFIG["topdir"] = $topdir
@ -183,8 +183,8 @@ def extmake(target)
$extpath |= $LIBPATH $extpath |= $LIBPATH
end end
ensure ensure
Config::CONFIG["srcdir"] = $top_srcdir RbConfig::CONFIG["srcdir"] = $top_srcdir
Config::CONFIG["topdir"] = topdir RbConfig::CONFIG["topdir"] = topdir
CONFIG["srcdir"] = mk_srcdir CONFIG["srcdir"] = mk_srcdir
CONFIG["topdir"] = mk_topdir CONFIG["topdir"] = mk_topdir
CONFIG.delete("hdrdir") CONFIG.delete("hdrdir")
@ -378,9 +378,9 @@ else
end end
if $extout if $extout
Config.expand(extout = "#$extout", Config::CONFIG.merge("topdir"=>$topdir)) RbConfig.expand(extout = "#$extout", RbConfig::CONFIG.merge("topdir"=>$topdir))
if $install if $install
Config.expand(dest = "#{$destdir}#{$rubylibdir}") RbConfig.expand(dest = "#{$destdir}#{$rubylibdir}")
FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun) FileUtils.cp_r(extout+"/.", dest, :verbose => true, :noop => $dryrun)
exit exit
end end
@ -472,7 +472,7 @@ unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}" $mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end end
if !$extlist.empty? and $extupdate if !$extlist.empty? and $extupdate
rm_f(Config::CONFIG["LIBRUBY_SO"]) rm_f(RbConfig::CONFIG["LIBRUBY_SO"])
end end
puts "making #{rubies.join(', ')}" puts "making #{rubies.join(', ')}"
$stdout.flush $stdout.flush

4
ext/iconv/charset_alias.rb
View file

@ -6,8 +6,8 @@ require 'optparse'
# http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset # http://www.ctan.org/tex-archive/macros/texinfo/texinfo/intl/config.charset
# Fri, 30 May 2003 00:09:00 GMT' # Fri, 30 May 2003 00:09:00 GMT'
OS = Config::CONFIG["target_os"] OS = RbConfig::CONFIG["target_os"]
SHELL = Config::CONFIG['SHELL'] SHELL = RbConfig::CONFIG['SHELL']
class Hash::Ordered < Hash class Hash::Ordered < Hash
def [](key) def [](key)

2
instruby.rb
View file

@ -1,7 +1,7 @@
#!./miniruby #!./miniruby
load "./rbconfig.rb" load "./rbconfig.rb"
include Config include RbConfig
srcdir = File.dirname(__FILE__) srcdir = File.dirname(__FILE__)
$:.unshift File.expand_path("lib", srcdir) $:.unshift File.expand_path("lib", srcdir)

32
lib/mkmf.rb
View file

@ -5,7 +5,7 @@ require 'rbconfig'
require 'fileutils' require 'fileutils'
require 'shellwords' require 'shellwords'
CONFIG = Config::MAKEFILE_CONFIG CONFIG = RbConfig::MAKEFILE_CONFIG
ORIG_LIBPATH = ENV['LIB'] ORIG_LIBPATH = ENV['LIB']
CXX_EXT = %w[cc cxx cpp] CXX_EXT = %w[cc cxx cpp]
@ -112,10 +112,10 @@ end
topdir = File.dirname(libdir = File.dirname(__FILE__)) topdir = File.dirname(libdir = File.dirname(__FILE__))
extdir = File.expand_path("ext", topdir) extdir = File.expand_path("ext", topdir)
$extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/" $extmk = File.expand_path($0)[0, extdir.size+1] == extdir+"/"
if not $extmk and File.exist?(Config::CONFIG["archdir"] + "/ruby.h") if not $extmk and File.exist?(RbConfig::CONFIG["archdir"] + "/ruby.h")
$hdrdir = $topdir = Config::CONFIG["archdir"] $hdrdir = $topdir = RbConfig::CONFIG["archdir"]
elsif File.exist?(($top_srcdir ||= topdir) + "/ruby.h") and elsif File.exist?(($top_srcdir ||= topdir) + "/ruby.h") and
File.exist?(($topdir ||= Config::CONFIG["topdir"]) + "/config.h") File.exist?(($topdir ||= RbConfig::CONFIG["topdir"]) + "/config.h")
$hdrdir = $top_srcdir $hdrdir = $top_srcdir
else else
abort "can't find header files for ruby." abort "can't find header files for ruby."
@ -259,7 +259,7 @@ ensure
end end
def link_command(ldflags, opt="", libpath=$LIBPATH) def link_command(ldflags, opt="", libpath=$LIBPATH)
Config::expand(TRY_LINK.dup, RbConfig::expand(TRY_LINK.dup,
CONFIG.merge('hdrdir' => $hdrdir.quote, CONFIG.merge('hdrdir' => $hdrdir.quote,
'src' => CONFTEST_C, 'src' => CONFTEST_C,
'INCFLAGS' => $INCFLAGS, 'INCFLAGS' => $INCFLAGS,
@ -273,13 +273,13 @@ def link_command(ldflags, opt="", libpath=$LIBPATH)
end end
def cc_command(opt="") def cc_command(opt="")
Config::expand("$(CC) -c #$INCFLAGS -I$(hdrdir) " \ RbConfig::expand("$(CC) -c #$INCFLAGS -I$(hdrdir) " \
"#$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} #{CONFTEST_C}", "#$CPPFLAGS #$CFLAGS #$ARCH_FLAG #{opt} #{CONFTEST_C}",
CONFIG.merge('hdrdir' => $hdrdir.quote)) CONFIG.merge('hdrdir' => $hdrdir.quote))
end end
def cpp_command(outfile, opt="") def cpp_command(outfile, opt="")
Config::expand("$(CPP) #$INCFLAGS -I$(hdrdir) " \ RbConfig::expand("$(CPP) #$INCFLAGS -I$(hdrdir) " \
"#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}", "#$CPPFLAGS #$CFLAGS #{opt} #{CONFTEST_C} #{outfile}",
CONFIG.merge('hdrdir' => $hdrdir.quote)) CONFIG.merge('hdrdir' => $hdrdir.quote))
end end
@ -484,7 +484,7 @@ end
def install_files(mfile, ifiles, map = nil, srcprefix = nil) def install_files(mfile, ifiles, map = nil, srcprefix = nil)
ifiles or return ifiles or return
srcprefix ||= '$(srcdir)' srcprefix ||= '$(srcdir)'
Config::expand(srcdir = srcprefix.dup) RbConfig::expand(srcdir = srcprefix.dup)
dirs = [] dirs = []
path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]} path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]}
ifiles.each do |files, dir, prefix| ifiles.each do |files, dir, prefix|
@ -972,7 +972,7 @@ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTALL_NAME']}
RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']} RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
arch = #{CONFIG['arch']} arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']} sitearch = #{CONFIG['sitearch']}
ruby_version = #{Config::CONFIG['ruby_version']} ruby_version = #{RbConfig::CONFIG['ruby_version']}
ruby = #{$ruby} ruby = #{$ruby}
RUBY = $(ruby#{sep}) RUBY = $(ruby#{sep})
RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
@ -1028,7 +1028,7 @@ def create_makefile(target, srcprefix = nil)
end end
srcprefix ||= '$(srcdir)' srcprefix ||= '$(srcdir)'
Config::expand(srcdir = srcprefix.dup) RbConfig::expand(srcdir = srcprefix.dup)
if not $objs if not $objs
$objs = [] $objs = []
@ -1290,7 +1290,7 @@ def init_mkmf(config = CONFIG)
$objs = nil $objs = nil
$srcs = nil $srcs = nil
$libs = "" $libs = ""
if $enable_shared or Config.expand(config["LIBRUBY"].dup) != Config.expand(config["LIBRUBY_A"].dup) if $enable_shared or RbConfig.expand(config["LIBRUBY"].dup) != RbConfig.expand(config["LIBRUBY_A"].dup)
$LIBRUBYARG = config['LIBRUBYARG'] $LIBRUBYARG = config['LIBRUBYARG']
end end
@ -1333,20 +1333,20 @@ when $bccwin
$nmake = ?b if /Borland/i =~ `#{make} -h` $nmake = ?b if /Borland/i =~ `#{make} -h`
end end
Config::CONFIG["srcdir"] = CONFIG["srcdir"] = RbConfig::CONFIG["srcdir"] = CONFIG["srcdir"] =
$srcdir = arg_config("--srcdir", File.dirname($0)) $srcdir = arg_config("--srcdir", File.dirname($0))
$configure_args["--topsrcdir"] ||= $srcdir $configure_args["--topsrcdir"] ||= $srcdir
if $curdir = arg_config("--curdir") if $curdir = arg_config("--curdir")
Config.expand(curdir = $curdir.dup) RbConfig.expand(curdir = $curdir.dup)
else else
curdir = $curdir = "." curdir = $curdir = "."
end end
unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir) unless File.expand_path(RbConfig::CONFIG["topdir"]) == File.expand_path(curdir)
CONFIG["topdir"] = $curdir CONFIG["topdir"] = $curdir
Config::CONFIG["topdir"] = curdir RbConfig::CONFIG["topdir"] = curdir
end end
$configure_args["--topdir"] ||= $curdir $configure_args["--topdir"] ||= $curdir
$ruby = arg_config("--ruby", File.join(Config::CONFIG["bindir"], CONFIG["ruby_install_name"])) $ruby = arg_config("--ruby", File.join(RbConfig::CONFIG["bindir"], CONFIG["ruby_install_name"]))
split = Shellwords.method(:shellwords).to_proc split = Shellwords.method(:shellwords).to_proc

4
lib/rdoc/ri/ri_paths.rb
View file

@ -26,9 +26,9 @@ module RI
DOC_DIR = "doc/rdoc" DOC_DIR = "doc/rdoc"
version = Config::CONFIG['ruby_version'] version = RbConfig::CONFIG['ruby_version']
base = File.join(Config::CONFIG['datadir'], "ri", version) base = File.join(RbConfig::CONFIG['datadir'], "ri", version)
SYSDIR = File.join(base, "system") SYSDIR = File.join(base, "system")
SITEDIR = File.join(base, "site") SITEDIR = File.join(base, "site")
homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] homedir = ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH']

6
lib/webrick/httpservlet/cgihandler.rb
View file

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

8
mkconfig.rb
View file

@ -26,7 +26,7 @@ print %[
# This file was created by #{mkconfig} when ruby was built. Any # This file was created by #{mkconfig} when ruby was built. Any
# changes made to this file will be lost the next time ruby is built. # changes made to this file will be lost the next time ruby is built.
module Config module RbConfig
RUBY_VERSION == "#{version}" or RUBY_VERSION == "#{version}" or
raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})" raise "ruby lib version (#{version}) doesn't match executable version (\#{RUBY_VERSION})"
@ -116,14 +116,14 @@ print <<EOS
CONFIG["topdir"] = File.dirname(__FILE__) CONFIG["topdir"] = File.dirname(__FILE__)
MAKEFILE_CONFIG = {} MAKEFILE_CONFIG = {}
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
def Config::expand(val, config = CONFIG) def RbConfig::expand(val, config = CONFIG)
val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var| val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var|
if !(v = $1 || $2) if !(v = $1 || $2)
'$' '$'
elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]] elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]]
pat, sub = $1, $2 pat, sub = $1, $2
config[v] = false config[v] = false
Config::expand(key, config) RbConfig::expand(key, config)
config[v] = key config[v] = key
key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
key key
@ -134,7 +134,7 @@ print <<EOS
val val
end end
CONFIG.each_value do |val| CONFIG.each_value do |val|
Config::expand(val) RbConfig::expand(val)
end end
end end
CROSS_COMPILING = nil unless defined? CROSS_COMPILING CROSS_COMPILING = nil unless defined? CROSS_COMPILING

2
rubytest.rb
View file

@ -2,7 +2,7 @@
exit if defined?(CROSS_COMPILING) exit if defined?(CROSS_COMPILING)
load './rbconfig.rb' load './rbconfig.rb'
include Config include RbConfig
ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}" ruby = "./#{CONFIG['ruby_install_name']}#{CONFIG['EXEEXT']}"
unless File.exist? ruby unless File.exist? ruby

2
runruby.rb
View file

@ -25,7 +25,7 @@ abs_archdir = File.expand_path(archdir)
$:.unshift(abs_archdir) $:.unshift(abs_archdir)
require 'rbconfig' require 'rbconfig'
config = Config::CONFIG config = RbConfig::CONFIG
ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT']) ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT'])
unless File.exist?(ruby) unless File.exist?(ruby)

4
test/dbm/test_dbm.rb
View file

@ -12,7 +12,7 @@ if defined? DBM
class TestDBM < Test::Unit::TestCase class TestDBM < Test::Unit::TestCase
def TestDBM.uname_s def TestDBM.uname_s
require 'rbconfig' require 'rbconfig'
case Config::CONFIG['host_os'] case RbConfig::CONFIG['host_os']
when 'cygwin' when 'cygwin'
require 'Win32API' require 'Win32API'
uname = Win32API.new('cygwin1', 'uname', 'P', 'I') uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@ -21,7 +21,7 @@ if defined? DBM
utsname.unpack('A20' * 5)[0] utsname.unpack('A20' * 5)[0]
else else
Config::CONFIG['host_os'] RbConfig::CONFIG['host_os']
end end
end end
SYSTEM = uname_s SYSTEM = uname_s

4
test/gdbm/test_gdbm.rb
View file

@ -12,7 +12,7 @@ if defined? GDBM
class TestGDBM < Test::Unit::TestCase class TestGDBM < Test::Unit::TestCase
def TestGDBM.uname_s def TestGDBM.uname_s
require 'rbconfig' require 'rbconfig'
case Config::CONFIG['host_os'] case RbConfig::CONFIG['host_os']
when 'cygwin' when 'cygwin'
require 'Win32API' require 'Win32API'
uname = Win32API.new('cygwin1', 'uname', 'P', 'I') uname = Win32API.new('cygwin1', 'uname', 'P', 'I')
@ -21,7 +21,7 @@ if defined? GDBM
utsname.unpack('A20' * 5)[0] utsname.unpack('A20' * 5)[0]
else else
Config::CONFIG['host_os'] RbConfig::CONFIG['host_os']
end end
end end
SYSTEM = uname_s SYSTEM = uname_s

4
test/ruby/envutil.rb
View file

@ -20,8 +20,8 @@ module EnvUtil
begin begin
require "rbconfig" require "rbconfig"
File.join( File.join(
Config::CONFIG["bindir"], RbConfig::CONFIG["bindir"],
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
) )
rescue LoadError rescue LoadError
"ruby" "ruby"

4
test/soap/calc/test_calc_cgi.rb
View file

@ -12,8 +12,8 @@ module Calc
class TestCalcCGI < Test::Unit::TestCase class TestCalcCGI < Test::Unit::TestCase
# This test shuld be run after installing ruby. # This test shuld be run after installing ruby.
RUBYBIN = File.join( RUBYBIN = File.join(
Config::CONFIG["bindir"], RbConfig::CONFIG["bindir"],
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
) )
RUBYBIN << " -d" if $DEBUG RUBYBIN << " -d" if $DEBUG

4
test/soap/header/test_authheader_cgi.rb
View file

@ -14,8 +14,8 @@ module Header
class TestAuthHeaderCGI < Test::Unit::TestCase class TestAuthHeaderCGI < Test::Unit::TestCase
# This test shuld be run after installing ruby. # This test shuld be run after installing ruby.
RUBYBIN = File.join( RUBYBIN = File.join(
Config::CONFIG["bindir"], RbConfig::CONFIG["bindir"],
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
) )
RUBYBIN << " -d" if $DEBUG RUBYBIN << " -d" if $DEBUG

4
test/soap/ssl/test_ssl.rb
View file

@ -16,8 +16,8 @@ class TestSSL < Test::Unit::TestCase
DIR = File.dirname(File.expand_path(__FILE__)) DIR = File.dirname(File.expand_path(__FILE__))
require 'rbconfig' require 'rbconfig'
RUBY = File.join( RUBY = File.join(
Config::CONFIG["bindir"], RbConfig::CONFIG["bindir"],
Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"] RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]
) )
def setup def setup

4
win32/mkexports.rb
View file

@ -1,6 +1,6 @@
#!./miniruby -s #!./miniruby -s
module Config module RbConfig
autoload :CONFIG, "rbconfig" autoload :CONFIG, "rbconfig"
end end
@ -112,7 +112,7 @@ end
class Exports::Mingw < Exports class Exports::Mingw < Exports
def self.nm def self.nm
@@nm ||= Config::CONFIG["NM"] @@nm ||= RbConfig::CONFIG["NM"]
end end
def each_export(objs) def each_export(objs)

2
win32/resource.rb
View file

@ -2,7 +2,7 @@
require 'rbconfig' require 'rbconfig'
CONFIG = Config::MAKEFILE_CONFIG CONFIG = RbConfig::MAKEFILE_CONFIG
fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0" fversion = "#{CONFIG['MAJOR']},#{CONFIG['MINOR']},#{CONFIG['TEENY']},0"