nobu	2010-05-28 10:40:39 +0900 (Fri, 28 May 2010)

  New Revision: 28047

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

  Log:
    * lib/mkmf.rb (checking_for): ignore toplevel.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/mkmf.rb
    branches/ruby_1_8/version.h
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/lib/mkmf.rb
    trunk/ChangeLog
    trunk/lib/mkmf.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 28046)
+++ ChangeLog	(revision 28047)
@@ -1,3 +1,7 @@
+Fri May 28 10:40:37 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (checking_for): ignore toplevel.
+
 Fri May 28 00:47:16 2010  Masaya Tarui  <tarui@r...>
 
 	* error.c (rb_bug): suppress the error report dialog if report_bug() 
Index: lib/mkmf.rb
===================================================================
--- lib/mkmf.rb	(revision 28046)
+++ lib/mkmf.rb	(revision 28047)
@@ -685,7 +685,7 @@
 # Internal use only.
 #
 def checking_for(m, fmt = nil)
-  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #'
+  f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
   m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
   message "%s", m
   a = r = nil
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 28046)
+++ ruby_1_8/ChangeLog	(revision 28047)
@@ -1,3 +1,7 @@
+Fri May 28 10:40:37 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (checking_for): ignore toplevel.
+
 Wed May 26 19:55:33 2010  NAKAMURA Usaku  <usa@r...>
 
 	* file.c (file_expand_path): revert a part of r22392. it's commit miss.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 28046)
+++ ruby_1_8/version.h	(revision 28047)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2010-05-26"
+#define RUBY_RELEASE_DATE "2010-05-28"
 #define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20100526
+#define RUBY_RELEASE_CODE 20100528
 #define RUBY_PATCHLEVEL -1
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 8
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 28
 
 #define NO_STRING_LITERAL_CONCATENATION 1
 #ifdef RUBY_EXTERN
Index: ruby_1_8/lib/mkmf.rb
===================================================================
--- ruby_1_8/lib/mkmf.rb	(revision 28046)
+++ ruby_1_8/lib/mkmf.rb	(revision 28047)
@@ -682,7 +682,7 @@
 # Internal use only.
 #
 def checking_for(m, fmt = nil)
-  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #'
+  f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
   m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
   message "%s", m
   a = r = nil
Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28046)
+++ ruby_1_9_2/ChangeLog	(revision 28047)
@@ -1,3 +1,7 @@
+Fri May 28 10:40:37 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (checking_for): ignore toplevel.
+
 Fri May 28 00:47:16 2010  Masaya Tarui  <tarui@r...>
 
 	* error.c (rb_bug): suppress the error report dialog if report_bug() 
Index: ruby_1_9_2/lib/mkmf.rb
===================================================================
--- ruby_1_9_2/lib/mkmf.rb	(revision 28046)
+++ ruby_1_9_2/lib/mkmf.rb	(revision 28047)
@@ -685,7 +685,7 @@
 # Internal use only.
 #
 def checking_for(m, fmt = nil)
-  f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim #'
+  f = caller[0][/in `([^<].*)'$/, 1] and f << ": " #` for vim #'
   m = "checking #{/\Acheck/ =~ f ? '' : 'for '}#{m}... "
   message "%s", m
   a = r = nil

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