ruby-changes:16961
From: usa <ko1@a...>
Date: Wed, 11 Aug 2010 10:56:03 +0900 (JST)
Subject: [ruby-changes:16961] Ruby:r28958 (ruby_1_8): * mkconfig.rb: should use RbConfig instead of Config, because the name
usa 2010-08-11 10:55:52 +0900 (Wed, 11 Aug 2010) New Revision: 28958 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28958 Log: * mkconfig.rb: should use RbConfig instead of Config, because the name of module was changed at r28900. this change solves the build failure. Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/mkconfig.rb Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 28957) +++ ruby_1_8/ChangeLog (revision 28958) @@ -1,3 +1,9 @@ +Wed Aug 11 10:53:28 2010 NAKAMURA Usaku <usa@r...> + + * 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@r...> * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri): Index: ruby_1_8/mkconfig.rb =================================================================== --- ruby_1_8/mkconfig.rb (revision 28957) +++ ruby_1_8/mkconfig.rb (revision 28958) @@ -156,14 +156,14 @@ 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 @@ 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. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/