зеркало из https://github.com/github/ruby.git
* 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:
Родитель
d5bfa31f82
Коммит
c42a5df5c1
10
ChangeLog
10
ChangeLog
|
@ -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>
|
Thu Apr 30 21:23:30 2009 Tanaka Akira <akr@fsij.org>
|
||||||
|
|
||||||
* runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.
|
* runruby.rb: use RbConfig::CONFIG instead of Config::CONFIG.
|
||||||
|
|
|
@ -540,7 +540,7 @@ rubies = []
|
||||||
%w[RUBY RUBYW STATIC_RUBY].each {|n|
|
%w[RUBY RUBYW STATIC_RUBY].each {|n|
|
||||||
r = n
|
r = n
|
||||||
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
|
if r = arg_config("--"+r.downcase) || config_string(r+"_INSTALL_NAME")
|
||||||
rubies << Config.expand(r+=EXEEXT)
|
rubies << RbConfig.expand(r+=EXEEXT)
|
||||||
$mflags << "#{n}=#{r}"
|
$mflags << "#{n}=#{r}"
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,13 +101,13 @@ def parse_args(argv = ARGV)
|
||||||
|
|
||||||
$destdir ||= $mflags.defined?("DESTDIR")
|
$destdir ||= $mflags.defined?("DESTDIR")
|
||||||
if $extout ||= $mflags.defined?("EXTOUT")
|
if $extout ||= $mflags.defined?("EXTOUT")
|
||||||
Config.expand($extout)
|
RbConfig.expand($extout)
|
||||||
end
|
end
|
||||||
|
|
||||||
$continue = $mflags.set?(?k)
|
$continue = $mflags.set?(?k)
|
||||||
|
|
||||||
if $installed_list ||= $mflags.defined?('INSTALLED_LIST')
|
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 = open($installed_list, "ab")
|
||||||
$installed_list.sync = true
|
$installed_list.sync = true
|
||||||
end
|
end
|
||||||
|
|
|
@ -823,7 +823,7 @@ module Gem
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
module Config
|
module RbConfig
|
||||||
# :stopdoc:
|
# :stopdoc:
|
||||||
class << self
|
class << self
|
||||||
# Return the path to the data directory associated with the named
|
# Return the path to the data directory associated with the named
|
||||||
|
|
|
@ -12,7 +12,7 @@ class TestConfig < RubyGemTestCase
|
||||||
|
|
||||||
def test_datadir
|
def test_datadir
|
||||||
datadir = RbConfig::CONFIG['datadir']
|
datadir = RbConfig::CONFIG['datadir']
|
||||||
assert_equal "#{datadir}/xyz", Config.datadir('xyz')
|
assert_equal "#{datadir}/xyz", RbConfig.datadir('xyz')
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Загрузка…
Ссылка в новой задаче