diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-28 01:40:39 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-05-28 01:40:39 +0000 |
| commit | 006f384f8e33840e555f0776bfd120f1f0dbd20c (patch) | |
| tree | 3b7832bbcfec5ec31d96ac372495516bd4cfa101 | |
| parent | fdef06a915400af8928afb605d431dd7b443e917 (diff) | |
* lib/mkmf.rb (checking_for): ignore toplevel.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@28047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/mkmf.rb | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,7 @@ +Fri May 28 10:40:37 2010 Nobuyoshi Nakada <[email protected]> + + * lib/mkmf.rb (checking_for): ignore toplevel. + Wed May 26 19:55:33 2010 NAKAMURA Usaku <[email protected]> * file.c (file_expand_path): revert a part of r22392. it's commit miss. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index aa720ba962..b259f00d25 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -682,7 +682,7 @@ end # 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 @@ -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 |