diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 08:30:07 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-11-15 08:30:07 +0000 |
| commit | 479c06d19d415f19a97f296c27a8a021f0c131c6 (patch) | |
| tree | 7856ec5e2b509a75f2a36ead4e0c7bf0b3c0e882 | |
| parent | f1bc46f06d56232b38d53e263efc631efe68eb9b (diff) | |
* tool/compile_prelude.rb: absolute path may not start with a slash.
pointed by usa.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tool/compile_prelude.rb | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,7 +1,13 @@ +Thu Nov 15 17:28:21 2007 Tanaka Akira <akr@fsij.org> + + * tool/compile_prelude.rb: absolute path may not start with a slash. + pointed by usa. + Thu Nov 15 17:07:54 2007 Tanaka Akira <akr@fsij.org> * tool/compile_prelude.rb: fix first substitution. use constant for prefix. + pointed by Richard Kilmer. Thu Nov 15 14:29:56 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> diff --git a/tool/compile_prelude.rb b/tool/compile_prelude.rb index 4d08b4d68a..314c98689e 100644 --- a/tool/compile_prelude.rb +++ b/tool/compile_prelude.rb @@ -33,8 +33,8 @@ lines_list = preludes.map {|filename| unless mkconf require 'rbconfig' mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}') - exlen = $:.grep(%r{\A/}).last.length - RbConfig::CONFIG["prefix"].length - setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.grep(%r{\\A/}).last[0..#{-exlen-1}]\n" + exlen = $:.reverse.find{|e|e!="."}.length - RbConfig::CONFIG["prefix"].length + setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.reverse.find{|e|e!=\".\"}[0..#{-exlen-1}]\n" teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }' end if RbConfig::MAKEFILE_CONFIG.has_key? key |