diff --git a/ChangeLog b/ChangeLog index a091d20edb..f4d6f4937f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri May 28 10:40:37 2010 Nobuyoshi Nakada + + * lib/mkmf.rb (checking_for): ignore toplevel. + Wed May 26 19:55:33 2010 NAKAMURA Usaku * 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 diff --git a/version.h b/version.h index b8a7ebc1e3..39f2da3be7 100644 --- a/version.h +++ b/version.h @@ -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