1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* tool/runruby.rb: no purelib.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2010-08-03 03:05:39 +00:00
parent 45992b4b25
commit 46a93a65df
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Aug 3 12:03:57 2010 URABE Shyouhei <shyouhei@ruby-lang.org>
* tool/runruby.rb: no purelib.
Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/purelib.rb: no longer used since the default load path of * ext/purelib.rb: no longer used since the default load path of

8
tool/runruby.rb
View File

@ -1,6 +1,5 @@
#!./miniruby #!./miniruby
pure = true
show = false show = false
precommand = [] precommand = []
while arg = ARGV[0] while arg = ARGV[0]
@ -18,7 +17,7 @@ while arg = ARGV[0]
when re =~ "extout" when re =~ "extout"
extout = value extout = value
when re =~ "pure" when re =~ "pure"
pure = (value != "no") # obsolete switch do nothing
when re =~ "debugger" when re =~ "debugger"
require 'shellwords' require 'shellwords'
precommand.concat(value ? (Shellwords.shellwords(value) unless value == "no") : %w"gdb --args") precommand.concat(value ? (Shellwords.shellwords(value) unless value == "no") : %w"gdb --args")
@ -62,9 +61,7 @@ env = {}
env["RUBY"] = File.expand_path(ruby) env["RUBY"] = File.expand_path(ruby)
env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR)
if pure if e = ENV["RUBYLIB"]
libs << File.expand_path("ext", srcdir) << "-"
elsif e = ENV["RUBYLIB"]
libs |= e.split(File::PATH_SEPARATOR) libs |= e.split(File::PATH_SEPARATOR)
end end
env["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR) env["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
@ -82,7 +79,6 @@ end
ENV.update env ENV.update env
cmd = [ruby] cmd = [ruby]
cmd << "-rpurelib.rb" if pure
cmd.concat(ARGV) cmd.concat(ARGV)
cmd.unshift(*precommand) unless precommand.empty? cmd.unshift(*precommand) unless precommand.empty?