From 46a93a65df6e51c8317cd958d44f21313b5a28ee Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 3 Aug 2010 03:05:39 +0000 Subject: * tool/runruby.rb: no purelib. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28841 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/runruby.rb | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index bb797e21cd..8ac35bcb58 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Aug 3 12:03:57 2010 URABE Shyouhei + + * tool/runruby.rb: no purelib. + Tue Aug 3 07:52:20 2010 Nobuyoshi Nakada * ext/purelib.rb: no longer used since the default load path of diff --git a/tool/runruby.rb b/tool/runruby.rb index d24b748c96..76478c66f1 100755 --- a/tool/runruby.rb +++ b/tool/runruby.rb @@ -1,6 +1,5 @@ #!./miniruby -pure = true show = false precommand = [] while arg = ARGV[0] @@ -18,7 +17,7 @@ while arg = ARGV[0] when re =~ "extout" extout = value when re =~ "pure" - pure = (value != "no") + # obsolete switch do nothing when re =~ "debugger" require 'shellwords' precommand.concat(value ? (Shellwords.shellwords(value) unless value == "no") : %w"gdb --args") @@ -62,9 +61,7 @@ env = {} env["RUBY"] = File.expand_path(ruby) env["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) -if pure - libs << File.expand_path("ext", srcdir) << "-" -elsif e = ENV["RUBYLIB"] +if e = ENV["RUBYLIB"] libs |= e.split(File::PATH_SEPARATOR) end env["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR) @@ -82,7 +79,6 @@ end ENV.update env cmd = [ruby] -cmd << "-rpurelib.rb" if pure cmd.concat(ARGV) cmd.unshift(*precommand) unless precommand.empty? -- cgit v1.2.3