kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* tool/compile_prelude.rb: fix first substitution.

Browse source 
use constant for prefix.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2007-11-15 08:08:40 +00:00
parent dc6e570665
commit f1bc46f06d
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Thu Nov 15 17:07:54 2007 Tanaka Akira <akr@fsij.org>
* tool/compile_prelude.rb: fix first substitution.
use constant for prefix.
Thu Nov 15 14:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Nov 15 14:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (prereq): added auto generated sources. [ruby-dev:32280] * common.mk (prereq): added auto generated sources. [ruby-dev:32280]

7
tool/compile_prelude.rb
View file

@ -29,6 +29,7 @@ lines_list = preludes.map {|filename|
need_ruby_prefix = false need_ruby_prefix = false
File.readlines(filename).each {|line| File.readlines(filename).each {|line|
line.gsub!(/RbConfig::CONFIG\["(\w+)"\]/) { line.gsub!(/RbConfig::CONFIG\["(\w+)"\]/) {
key = $1
unless mkconf unless mkconf
require 'rbconfig' require 'rbconfig'
mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}') mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}')
@ -36,12 +37,12 @@ lines_list = preludes.map {|filename|
setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.grep(%r{\\A/}).last[0..#{-exlen-1}]\n" setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.grep(%r{\\A/}).last[0..#{-exlen-1}]\n"
teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }' teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }'
end end
if RbConfig::MAKEFILE_CONFIG.has_key? $1 if RbConfig::MAKEFILE_CONFIG.has_key? key
val = RbConfig.expand("$(#$1)", mkconf) val = RbConfig.expand("$(#{key})", mkconf)
need_ruby_prefix = true if /\A\#{TMP_RUBY_PREFIX\}/ =~ val need_ruby_prefix = true if /\A\#{TMP_RUBY_PREFIX\}/ =~ val
c_esc(val) c_esc(val)
else else
$& "nil"
end end
} }
lines << c_esc(line) lines << c_esc(line)