archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* mkconfig.rb: should use RbConfig instead of Config, because the name

Browse source 
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:
usa 2010-08-11 01:55:52 +00:00
parent 640dc5b997
commit 3ad45b72b4
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> Tue Aug 10 17:35:49 2010 NARUSE, Yui <naruse@ruby-lang.org>
* lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri): * lib/webrick/httprequest.rb (WEBrick::HTTPRequest::parse_uri):

6
mkconfig.rb
View file

@ -156,14 +156,14 @@ print <<EOS
CONFIG["topdir"] = File.dirname(__FILE__) CONFIG["topdir"] = File.dirname(__FILE__)
MAKEFILE_CONFIG = {} MAKEFILE_CONFIG = {}
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} 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| val.gsub!(/\\$\\$|\\$\\(([^()]+)\\)|\\$\\{([^{}]+)\\}/) do |var|
if !(v = $1 || $2) if !(v = $1 || $2)
'$' '$'
elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]] elsif key = config[v = v[/\\A[^:]+(?=(?::(.*?)=(.*))?\\z)/]]
pat, sub = $1, $2 pat, sub = $1, $2
config[v] = false config[v] = false
Config::expand(key, config) RbConfig::expand(key, config)
config[v] = key config[v] = key
key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
key key
@ -174,7 +174,7 @@ print <<EOS
val val
end end
CONFIG.each_value do |val| CONFIG.each_value do |val|
Config::expand(val) RbConfig::expand(val)
end end
end end
autoload :Config, "rbconfig/obsolete.rb" # compatibility for ruby-1.8.4 and older. autoload :Config, "rbconfig/obsolete.rb" # compatibility for ruby-1.8.4 and older.