summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-11 01:55:52 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-11 01:55:52 +0000
commit3ad45b72b40372b30209bbd561c26d960a4862e1 (patch)
tree501e4e939890983ad67acd1a54e0610a29f5aed8
parent640dc5b9972bce501bc541252ef8817b843b48fb (diff)
* 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
-rw-r--r--ChangeLog6
-rwxr-xr-xmkconfig.rb6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c3072e250c..eca8e7615f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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):
diff --git a/mkconfig.rb b/mkconfig.rb
index ebd58ba1e8..584f0fa2d8 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -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.