kosaki	2012-09-09 15:44:20 +0900 (Sun, 09 Sep 2012)

  New Revision: 36930

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36930

  Log:
    merge revision(s) 35687:35691:
    
    * ext/zlib/extconf.rb: Use an exception instaed of bare puts.
    
    * ext/psych/extconf.rb: Use an exception instaed of bare abort.
    
    * ext/fiddle/extconf.rb: Use an exception instaed of bare abort.
    
    * ext/readline/extconf.rb: Use an exception instead of bare exit.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/fiddle/extconf.rb
    branches/ruby_1_9_3/ext/readline/extconf.rb
    branches/ruby_1_9_3/ext/zlib/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36929)
+++ ruby_1_9_3/ChangeLog	(revision 36930)
@@ -1,3 +1,19 @@
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/zlib/extconf.rb: Use an exception instaed of bare puts.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/psych/extconf.rb: Use an exception instaed of bare abort.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/fiddle/extconf.rb: Use an exception instaed of bare abort.
+
+Sun Sep  9 02:44:21 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* ext/readline/extconf.rb: Use an exception instead of bare exit.
+
 Sun Sep  9 02:34:39 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* ext/extmk.rb: Show a message when extconf.rb raised an exception.
Index: ruby_1_9_3/ext/zlib/extconf.rb
===================================================================
--- ruby_1_9_3/ext/zlib/extconf.rb	(revision 36929)
+++ ruby_1_9_3/ext/zlib/extconf.rb	(revision 36930)
@@ -48,8 +48,7 @@
     'OS_UNKNOWN' => 'Unknown',
   }
   unless OS_NAMES.key? os_code then
-    puts "invalid OS_CODE `#{os_code}'"
-    exit
+    raise "invalid OS_CODE `#{os_code}'"
   end
   message "#{OS_NAMES[os_code]}\n"
   defines << "OS_CODE=#{os_code}"
Index: ruby_1_9_3/ext/readline/extconf.rb
===================================================================
--- ruby_1_9_3/ext/readline/extconf.rb	(revision 36929)
+++ ruby_1_9_3/ext/readline/extconf.rb	(revision 36930)
@@ -40,14 +40,14 @@
   unless (have_readline_header("editline/readline.h") ||
           have_readline_header("readline/readline.h")) &&
           have_library("edit", "readline")
-    exit
+    raise "libedit not found"
   end
 when false
   # --disable-libedit
   unless ((have_readline_header("readline/readline.h") &&
            have_readline_header("readline/history.h")) &&
            have_library("readline", "readline"))
-    exit
+    raise "readline not found"
   end
 else
   # does not specify
@@ -57,7 +57,7 @@
             have_library("edit", "readline"))) ||
             (have_readline_header("editline/readline.h") &&
              have_library("edit", "readline"))
-    exit
+    raise "readline nor libedit not found"
   end
 end
 
Index: ruby_1_9_3/ext/fiddle/extconf.rb
===================================================================
--- ruby_1_9_3/ext/fiddle/extconf.rb	(revision 36929)
+++ ruby_1_9_3/ext/fiddle/extconf.rb	(revision 36930)
@@ -9,12 +9,12 @@
   if have_header('ffi/ffi.h')
     $defs.push(format('-DUSE_HEADER_HACKS'))
   else
-    abort "ffi.h is missing. Please install libffi."
+    raise "ffi.h is missing. Please install libffi."
   end
 end
 
 unless have_library('ffi') || have_library('libffi')
-  abort "libffi is missing. Please install libffi."
+  raise "libffi is missing. Please install libffi."
 end
 
 have_header 'sys/mman.h'
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36929)
+++ ruby_1_9_3/version.h	(revision 36930)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 267
+#define RUBY_PATCHLEVEL 268
 
 #define RUBY_RELEASE_DATE "2012-09-09"
 #define RUBY_RELEASE_YEAR 2012

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/