* 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
esaul · Apr 30, 2009 · d5bfa31 · d5bfa31
1 parent 587082d
commit d5bfa31
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 15 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,25 @@
+Thu Apr 30 21:23:30 2009  Tanaka Akira  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* lib/net/http.rb: documentation typo fixed.  [ruby-core:23335]

diff --git a/benchmark/report.rb b/benchmark/report.rb
@@ -25,8 +25,8 @@ def exec_command type, file, w
 
 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
@@ -6,8 +6,8 @@
 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
@@ -107,7 +107,7 @@ def $mflags.defined?(var)
   $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
@@ -41,7 +41,7 @@
 
 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
@@ -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
@@ -11,7 +11,7 @@
 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
@@ -52,7 +52,7 @@ def test_self_bindir_default_dir
     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
@@ -100,16 +100,16 @@ def test_initialize_command_line
   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]
 
     platform = Gem::Platform.new 'i386-mswin32'
 
     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
@@ -4,8 +4,8 @@
 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
@@ -7,7 +7,7 @@
 else
   $ruby = 'miniruby'
 end
-$matzruby = Config::CONFIG['ruby_install_name']
+$matzruby = RbConfig::CONFIG['ruby_install_name']
 
 ARGV.each{|opt|
   if /\Aruby=(.+)/ =~ opt