[前][次][番号順一覧][スレッド一覧]

ruby-changes:2443

From: ko1@a...
Date: 15 Nov 2007 18:08:15 +0900
Subject: [ruby-changes:2443] akr - Ruby:r13934 (trunk): * tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path

akr	2007-11-15 18:07:45 +0900 (Thu, 15 Nov 2007)

  New Revision: 13934

  Modified files:
    trunk/ChangeLog
    trunk/tool/compile_prelude.rb

  Log:
    * tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
      environment.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/tool/compile_prelude.rb?r1=13934&r2=13933
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13934&r2=13933

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13933)
+++ ChangeLog	(revision 13934)
@@ -1,3 +1,8 @@
+Thu Nov 15 18:04:06 2007  Tanaka Akira  <akr@f...>
+
+	* tool/compile_prelude.rb: fix TMP_RUBY_PREFIX for relative load path
+	  environment.
+
 Thu Nov 15 17:28:21 2007  Tanaka Akira  <akr@f...>
 
 	* tool/compile_prelude.rb: absolute path may not start with a slash.
Index: tool/compile_prelude.rb
===================================================================
--- tool/compile_prelude.rb	(revision 13933)
+++ tool/compile_prelude.rb	(revision 13934)
@@ -33,8 +33,7 @@
       unless mkconf
         require 'rbconfig'
         mkconf = RbConfig::MAKEFILE_CONFIG.merge('prefix'=>'#{TMP_RUBY_PREFIX}')
-        exlen = $:.reverse.find{|e|e!="."}.length - RbConfig::CONFIG["prefix"].length
-        setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.reverse.find{|e|e!=\".\"}[0..#{-exlen-1}]\n"
+        setup_ruby_prefix = "TMP_RUBY_PREFIX = $:.reverse.find{|e|e!=\".\"}.sub(%r{(.*)/lib/.*}m, \"\\\\1\")\n"
         teardown_ruby_prefix = 'Object.class_eval { remove_const "TMP_RUBY_PREFIX" }'
       end
       if RbConfig::MAKEFILE_CONFIG.has_key? key

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml

[前][次][番号順一覧][スレッド一覧]