From d5bfa31f824005f7a8ce6c2bae1fafd2461aad80 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 30 Apr 2009 12:25:23 +0000 Subject: [PATCH] * runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG. * spec/default.mspec: ditto. * yarvtest/yarvtest.rb: ditto. * instruby.rb: ditto. * benchmark/report.rb: ditto. * benchmark/runc.rb: ditto. * tool/eval.rb: ditto. * test/rubygems/test_gem.rb: ditto. * test/rubygems/test_config.rb: ditto. * test/rubygems/test_gem_platform.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23312 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 22 ++++++++++++++++++++++ benchmark/report.rb | 4 ++-- benchmark/runc.rb | 4 ++-- instruby.rb | 2 +- runruby.rb | 2 +- spec/default.mspec | 2 +- test/rubygems/test_config.rb | 2 +- test/rubygems/test_gem.rb | 2 +- test/rubygems/test_gem_platform.rb | 6 +++--- tool/eval.rb | 4 ++-- yarvtest/yarvtest.rb | 2 +- 11 files changed, 37 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0c173d1802..9b662069bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +Thu Apr 30 21:23:30 2009 Tanaka Akira + + * runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG. + + * spec/default.mspec: ditto. + + * yarvtest/yarvtest.rb: ditto. + + * instruby.rb: ditto. + + * benchmark/report.rb: ditto. + + * benchmark/runc.rb: ditto. + + * tool/eval.rb: ditto. + + * test/rubygems/test_gem.rb: ditto. + + * test/rubygems/test_config.rb: ditto. + + * test/rubygems/test_gem_platform.rb: ditto. + Thu Apr 30 18:18:13 2009 Yukihiro Matsumoto * lib/net/http.rb: documentation typo fixed. [ruby-core:23335] diff --git a/benchmark/report.rb b/benchmark/report.rb index 8305330b45..e931966cca 100644 --- a/benchmark/report.rb +++ b/benchmark/report.rb @@ -25,8 +25,8 @@ end def benchmark cmd rubybin = ENV['RUBY'] || File.join( - Config::CONFIG["bindir"], - Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]) + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]) IO.popen(rubybin, 'r+'){|io| io.write cmd diff --git a/benchmark/runc.rb b/benchmark/runc.rb index 14ab171c12..ec1d36a61b 100644 --- a/benchmark/runc.rb +++ b/benchmark/runc.rb @@ -6,8 +6,8 @@ require 'benchmark' require 'rbconfig' $rubybin = ENV['RUBY'] || File.join( - Config::CONFIG["bindir"], - Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]) + RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]) def runfile file puts file diff --git a/instruby.rb b/instruby.rb index 5d3e3820e3..4cb27848d1 100755 --- a/instruby.rb +++ b/instruby.rb @@ -107,7 +107,7 @@ def parse_args(argv = ARGV) $continue = $mflags.set?(?k) if $installed_list ||= $mflags.defined?('INSTALLED_LIST') - Config.expand($installed_list, Config::CONFIG) + Config.expand($installed_list, RbConfig::CONFIG) $installed_list = open($installed_list, "ab") $installed_list.sync = true end diff --git a/runruby.rb b/runruby.rb index 2bddf634ed..a72cc653bc 100755 --- a/runruby.rb +++ b/runruby.rb @@ -41,7 +41,7 @@ $:.unshift(abs_archdir) config = File.read(conffile = File.join(abs_archdir, 'rbconfig.rb')) config.sub!(/^(\s*)RUBY_VERSION\s*==.*(\sor\s*)$/, '\1true\2') -config = Module.new {module_eval(config, conffile)}::Config::CONFIG +config = Module.new {module_eval(config, conffile)}::RbConfig::CONFIG ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT']) unless File.exist?(ruby) diff --git a/spec/default.mspec b/spec/default.mspec index 50cc6b0920..cbe59b49fb 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -7,7 +7,7 @@ class MSpecScript f.read[/^\s*srcdir\s*=\s*(.+)/i] and srcdir = $1 } end - config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print Config::CONFIG["#{name}"]'`} + config = proc{|name| `#{builddir}/miniruby -I#{srcdir} -rrbconfig -e 'print RbConfig::CONFIG["#{name}"]'`} # The default implementation to run the specs. set :target, File.join(builddir, "miniruby#{config['exeext']}") diff --git a/test/rubygems/test_config.rb b/test/rubygems/test_config.rb index beaa2325dc..4867538ac4 100644 --- a/test/rubygems/test_config.rb +++ b/test/rubygems/test_config.rb @@ -11,7 +11,7 @@ require 'rubygems' class TestConfig < RubyGemTestCase def test_datadir - datadir = Config::CONFIG['datadir'] + datadir = RbConfig::CONFIG['datadir'] assert_equal "#{datadir}/xyz", Config.datadir('xyz') end diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index fd9954018c..e777527007 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb @@ -52,7 +52,7 @@ class TestGem < RubyGemTestCase bindir = if defined?(RUBY_FRAMEWORK_VERSION) then '/usr/bin' else - Config::CONFIG['bindir'] + RbConfig::CONFIG['bindir'] end assert_equal bindir, Gem.bindir(default) diff --git a/test/rubygems/test_gem_platform.rb b/test/rubygems/test_gem_platform.rb index fdb8fb11ed..e71fcd5c5d 100644 --- a/test/rubygems/test_gem_platform.rb +++ b/test/rubygems/test_gem_platform.rb @@ -100,8 +100,8 @@ class TestGemPlatform < RubyGemTestCase end def test_initialize_mswin32_vc6 - orig_RUBY_SO_NAME = Config::CONFIG['RUBY_SO_NAME'] - Config::CONFIG['RUBY_SO_NAME'] = 'msvcrt-ruby18' + orig_RUBY_SO_NAME = RbConfig::CONFIG['RUBY_SO_NAME'] + RbConfig::CONFIG['RUBY_SO_NAME'] = 'msvcrt-ruby18' expected = ['x86', 'mswin32', nil] @@ -109,7 +109,7 @@ class TestGemPlatform < RubyGemTestCase assert_equal expected, platform.to_a, 'i386-mswin32 VC6' ensure - Config::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME + RbConfig::CONFIG['RUBY_SO_NAME'] = orig_RUBY_SO_NAME end def test_initialize_platform diff --git a/tool/eval.rb b/tool/eval.rb index 906ba9c23c..db6d11cddd 100644 --- a/tool/eval.rb +++ b/tool/eval.rb @@ -4,8 +4,8 @@ require 'fileutils' require 'pp' Ruby = ENV['RUBY'] || - File.join(Config::CONFIG["bindir"], - Config::CONFIG["ruby_install_name"] + Config::CONFIG["EXEEXT"]) + File.join(RbConfig::CONFIG["bindir"], + RbConfig::CONFIG["ruby_install_name"] + RbConfig::CONFIG["EXEEXT"]) # OPTIONS = %w{ diff --git a/yarvtest/yarvtest.rb b/yarvtest/yarvtest.rb index 56c173bbe0..3dda7e0884 100644 --- a/yarvtest/yarvtest.rb +++ b/yarvtest/yarvtest.rb @@ -7,7 +7,7 @@ if /mswin32/ !~ RUBY_PLATFORM else $ruby = 'miniruby' end -$matzruby = Config::CONFIG['ruby_install_name'] +$matzruby = RbConfig::CONFIG['ruby_install_name'] ARGV.each{|opt| if /\Aruby=(.+)/ =~ opt