summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rwxr-xr-xrunruby.rb10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index ec78c95..2538142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Jun 23 23:55:59 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * runruby.rb: should load built rbconfig.rb.
+
Thu Jun 23 16:53:15 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/canvastag.rb: TkcGroup.new cannot include given items.
@@ -7,7 +11,7 @@ Thu Jun 23 16:53:15 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/canvas.rb: TkCanvas#dtag and some subcommands of
TkCanvas#addtag fail to treat a TkcTag argument.
- * ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
+ * ext/tk/lib/tk/event.rb: add TkEvent::Event#generate to help to send
current event to other widgets.
Mon Jun 20 18:44:04 2005 Tanaka Akira <akr@m17n.org>
diff --git a/runruby.rb b/runruby.rb
index a175dcb..e749441 100755
--- a/runruby.rb
+++ b/runruby.rb
@@ -18,18 +18,20 @@ while arg = ARGV[0]
ARGV.shift
end
-require 'rbconfig'
-config = Config::CONFIG
-
srcdir ||= File.dirname(__FILE__)
archdir ||= '.'
+abs_archdir = File.expand_path(archdir)
+$:.unshift(abs_archdir)
+
+require 'rbconfig'
+config = Config::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
-abs_archdir = File.expand_path(archdir)
libs = [abs_archdir, File.expand_path("lib", srcdir)]
if extout
abs_extout = File.expand_path(extout)