ruby-changes:11673
From: akr <ko1@a...>
Date: Thu, 30 Apr 2009 21:25:41 +0900 (JST)
Subject: [ruby-changes:11673] Ruby:r23312 (trunk): * runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.
akr 2009-04-30 21:25:23 +0900 (Thu, 30 Apr 2009) New Revision: 23312 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23312 Log: * 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. Modified files: trunk/ChangeLog trunk/benchmark/report.rb trunk/benchmark/runc.rb trunk/instruby.rb trunk/runruby.rb trunk/spec/default.mspec trunk/test/rubygems/test_config.rb trunk/test/rubygems/test_gem.rb trunk/test/rubygems/test_gem_platform.rb trunk/tool/eval.rb trunk/yarvtest/yarvtest.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 23311) +++ ChangeLog (revision 23312) @@ -1,3 +1,25 @@ +Thu Apr 30 21:23:30 2009 Tanaka Akira <akr@f...> + + * 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 <matz@r...> * lib/net/http.rb: documentation typo fixed. [ruby-core:23335] Index: runruby.rb =================================================================== --- runruby.rb (revision 23311) +++ runruby.rb (revision 23312) @@ -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) Index: spec/default.mspec =================================================================== --- spec/default.mspec (revision 23311) +++ spec/default.mspec (revision 23312) @@ -7,7 +7,7 @@ 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']}") Index: yarvtest/yarvtest.rb =================================================================== --- yarvtest/yarvtest.rb (revision 23311) +++ yarvtest/yarvtest.rb (revision 23312) @@ -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 Index: instruby.rb =================================================================== --- instruby.rb (revision 23311) +++ instruby.rb (revision 23312) @@ -107,7 +107,7 @@ $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 Index: benchmark/report.rb =================================================================== --- benchmark/report.rb (revision 23311) +++ benchmark/report.rb (revision 23312) @@ -25,8 +25,8 @@ 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 Index: benchmark/runc.rb =================================================================== --- benchmark/runc.rb (revision 23311) +++ benchmark/runc.rb (revision 23312) @@ -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 Index: tool/eval.rb =================================================================== --- tool/eval.rb (revision 23311) +++ tool/eval.rb (revision 23312) @@ -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{ Index: test/rubygems/test_gem.rb =================================================================== --- test/rubygems/test_gem.rb (revision 23311) +++ test/rubygems/test_gem.rb (revision 23312) @@ -52,7 +52,7 @@ bindir = if defined?(RUBY_FRAMEWORK_VERSION) then '/usr/bin' else - Config::CONFIG['bindir'] + RbConfig::CONFIG['bindir'] end assert_equal bindir, Gem.bindir(default) Index: test/rubygems/test_config.rb =================================================================== --- test/rubygems/test_config.rb (revision 23311) +++ test/rubygems/test_config.rb (revision 23312) @@ -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 Index: test/rubygems/test_gem_platform.rb =================================================================== --- test/rubygems/test_gem_platform.rb (revision 23311) +++ test/rubygems/test_gem_platform.rb (revision 23312) @@ -100,8 +100,8 @@ 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 @@ 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 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/