* tool/rbinstall.rb (parse_args): show help message and exit if

  rbconfig could not load.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 18 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 938139d1c..3b2f39510 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,12 @@
-Tue Sep 15 06:24:35 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Tue Sep 15 06:42:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk (install-all): target to install all.
 
 	* tool/rbinstall.rb (parse_args): accept all install targets.
 
+	* tool/rbinstall.rb (parse_args): show help message and exit if
+	  rbconfig could not load.
+
 Tue Sep 15 04:25:03 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (RDOCTARGET): use install-all.  [ruby-dev:39334]
diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb
index 6d272907b..4263cdace 100755
--- a/tool/rbinstall.rb
+++ b/tool/rbinstall.rb
@@ -1,8 +1,13 @@
 #!./miniruby
 
-load "./rbconfig.rb"
-include RbConfig
-$".unshift File.expand_path("./rbconfig.rb")
+begin
+  load "./rbconfig.rb"
+rescue LoadError
+  CONFIG = Hash.new {""}
+else
+  include RbConfig
+  $".unshift File.expand_path("./rbconfig.rb")
+end
 
 srcdir = File.expand_path('../..', __FILE__)
 unless defined?(CROSS_COMPILING) and CROSS_COMPILING
@@ -35,7 +40,7 @@ def parse_args(argv = ARGV)
   $cmdtype = ('bat' if File::ALT_SEPARATOR == '\\')
   mflags = []
   opt = OptionParser.new
-  opt.on('-n') {$dryrun = true}
+  opt.on('-n', '--dry-run') {$dryrun = true}
   opt.on('--dest-dir=DIR') {|dir| $destdir = dir}
   opt.on('--extout=DIR') {|dir| $extout = (dir unless dir.empty?)}
   opt.on('--make=COMMAND') {|make| $make = make}
@@ -79,6 +84,11 @@ def parse_args(argv = ARGV)
     end
   end rescue abort "#{$!.message}\n#{opt.help}"
 
+  unless defined?(RbConfig)
+    puts opt.help
+    exit
+  end
+
   $make, *rest = Shellwords.shellwords($make)
   $mflags.unshift(*rest) unless rest.empty?
   $mflags.unshift(*mflags)