diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | runruby.rb | 24 |
2 files changed, 25 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Mar 13 03:24:07 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * runruby.rb: added --pure (turned on by default) and --debugger + options. + Tue Mar 13 02:50:28 2007 Akinori MUSHA <knu@iDaemons.org> * lib/cgi.rb (CGI::header): IIS >= 5.0 does not need the nph diff --git a/runruby.rb b/runruby.rb index cc04895c33..b1b8000389 100755 --- a/runruby.rb +++ b/runruby.rb @@ -1,5 +1,6 @@ #!./miniruby +pure = true while arg = ARGV[0] break ARGV.shift if arg == '--' /\A--([-\w]+)(?:=(.*))?\z/ =~ arg or break @@ -12,6 +13,10 @@ while arg = ARGV[0] archdir = value when re =~ "extout" extout = value + when re =~ "pure" + pure = (value != "no") + when re =~ "debugger" + debugger = value ? (value.split unless value == "no") : %w"gdb --args" else break end @@ -25,23 +30,24 @@ abs_archdir = File.expand_path(archdir) $:.unshift(abs_archdir) require 'rbconfig' -config = Config::CONFIG +config = RbConfig::CONFIG ruby = File.join(archdir, config["RUBY_INSTALL_NAME"]+config['EXEEXT']) unless File.exist?(ruby) abort "#{ruby} is not found.\nTry `make' first, then `make test', please.\n" end -libs = [abs_archdir, File.expand_path("lib", srcdir)] +libs = [abs_archdir] if extout abs_extout = File.expand_path(extout) libs << File.expand_path("common", abs_extout) << File.expand_path(RUBY_PLATFORM, abs_extout) end +libs << File.expand_path("lib", srcdir) config["bindir"] = abs_archdir ENV["RUBY"] = File.expand_path(ruby) ENV["PATH"] = [abs_archdir, ENV["PATH"]].compact.join(File::PATH_SEPARATOR) -if e = ENV["RUBYLIB"] +if !pure and e = ENV["RUBYLIB"] libs |= e.split(File::PATH_SEPARATOR) end ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR) @@ -55,5 +61,15 @@ if File.file?(libruby_so) ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ') end end +begin + open("puretest.rb", IO::EXCL|IO::CREAT|IO::WRONLY) do |f| + f.puts('$LOAD_PATH.replace(ENV["RUBYLIB"].split(File::PATH_SEPARATOR))') + end +rescue Errno::EEXIST +end -exec ruby, *ARGV +cmd = [ruby] +cmd << "-rpuretest.rb" if pure +cmd.concat(ARGV) +cmd.unshift(*debugger) if debugger +exec(*cmd) |