* mkconfig.rb: should use RbConfig instead of Config, because the name
of module was changed at r28900. this change solves the build failure. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28958 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
640dc5b997
commit
3ad45b72b4
|
@ -1,3 +1,9 @@
|
|||
Wed Aug 11 10:53:28 2010 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* mkconfig.rb: should use RbConfig instead of Config, because the name
|
||||
of module was changed at r28900. this change solves the build
|
||||
failure.
|
||||
|
||||
Tue Aug 10 17:35:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):
|
||||
|
|
|
@ -156,14 +156,14 @@ print <<EOS
|
|||
CONFIG["topdir"] = File.dirname(__FILE__)
|
||||
MAKEFILE_CONFIG = {}
|
||||
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
|
||||
def Config::expand(val, config = CONFIG)
|
||||
def RbConfig::expand(val, config = CONFIG)
|
||||
val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var|
|
||||
if !(v = $1 || $2)
|
||||
'$'
|
||||
elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]]
|
||||
pat, sub = $1, $2
|
||||
config[v] = false
|
||||
Config::expand(key, config)
|
||||
RbConfig::expand(key, config)
|
||||
config[v] = key
|
||||
key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
|
||||
key
|
||||
|
@ -174,7 +174,7 @@ print <<EOS
|
|||
val
|
||||
end
|
||||
CONFIG.each_value do |val|
|
||||
Config::expand(val)
|
||||
RbConfig::expand(val)
|
||||
end
|
||||
end
|
||||
autoload :Config, "rbconfig/obsolete.rb" # compatibility for ruby-1.8.4 and older.
|
||||
|
|
Loading…
Reference in New Issue