1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* ext/extmk.rb: use RbConfig instead of Config.

* instruby.rb: ditto.

* lib/rubygems.rb: ditto.

* test/rubygems/test_config.rb: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-04-30 16:34:01 +00:00
parent d5bfa31f82
commit c42a5df5c1
5 changed files with 15 additions and 5 deletions

View file

@ -1,3 +1,13 @@
Fri May 1 01:31:19 2009 Tanaka Akira <akr@fsij.org>
* ext/extmk.rb: use RbConfig instead of Config.
* instruby.rb: ditto.
* lib/rubygems.rb: ditto.
* test/rubygems/test_config.rb: ditto.
Thu Apr 30 21:23:30 2009 Tanaka Akira <akr@fsij.org>
* runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.

View file

@ -540,7 +540,7 @@ rubies = []
%w[RUBY RUBYW STATIC_RUBY].each {|n|
r = n
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
rubies << Config.expand(r+=EXEEXT)
rubies << RbConfig.expand(r+=EXEEXT)
$mflags << "#{n}=#{r}"
end
}

View file

@ -101,13 +101,13 @@ def parse_args(argv = ARGV)
$destdir ||= $mflags.defined?("DESTDIR")
if $extout ||= $mflags.defined?("EXTOUT")
Config.expand($extout)
RbConfig.expand($extout)
end
$continue = $mflags.set?(?k)
if $installed_list ||= $mflags.defined?('INSTALLED_LIST')
Config.expand($installed_list, RbConfig::CONFIG)
RbConfig.expand($installed_list, RbConfig::CONFIG)
$installed_list = open($installed_list, "ab")
$installed_list.sync = true
end

View file

@ -823,7 +823,7 @@ module Gem
end
module Config
module RbConfig
# :stopdoc:
class << self
# Return the path to the data directory associated with the named

View file

@ -12,7 +12,7 @@ class TestConfig < RubyGemTestCase
def test_datadir
datadir = RbConfig::CONFIG['datadir']
assert_equal "#{datadir}/xyz", Config.datadir('xyz')
assert_equal "#{datadir}/xyz", RbConfig.datadir('xyz')
end
end