ruby-changes:22611
From: naruse <ko1@a...>
Date: Fri, 17 Feb 2012 13:24:52 +0900 (JST)
Subject: [ruby-changes:22611] naruse:r34660 (ruby_1_9_3): merge revision(s) 34652:
naruse 2012-02-17 13:24:39 +0900 (Fri, 17 Feb 2012) New Revision: 34660 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34660 Log: merge revision(s) 34652: * lib/mkmf.rb (create_header): log the content of header. Modified files: branches/ruby_1_9_3/ChangeLog branches/ruby_1_9_3/lib/mkmf.rb branches/ruby_1_9_3/version.h Index: ruby_1_9_3/ChangeLog =================================================================== --- ruby_1_9_3/ChangeLog (revision 34659) +++ ruby_1_9_3/ChangeLog (revision 34660) @@ -1,3 +1,7 @@ +Fri Feb 17 12:51:25 2012 Nobuyoshi Nakada <nobu@r...> + + * lib/mkmf.rb (create_header): log the content of header. + Fri Feb 17 12:26:15 2012 CHIKANAGA Tomoyuki <nagachika00@g...> * test/readline/test_readline.rb (test_completion_proc_empty_result): Index: ruby_1_9_3/lib/mkmf.rb =================================================================== --- ruby_1_9_3/lib/mkmf.rb (revision 34659) +++ ruby_1_9_3/lib/mkmf.rb (revision 34660) @@ -331,11 +331,11 @@ end end -def log_src(src) +def log_src(src, heading="checked program was") src = src.split(/^/) fmt = "%#{src.size.to_s.size}d: %s" Logging::message <<"EOM" -checked program was: +#{heading}: /* begin */ EOM src.each_with_index {|line, no| Logging::message fmt, no+1, line} @@ -1497,6 +1497,7 @@ end hdr << "#endif\n" hdr = hdr.join + log_src(hdr, "#{header} is") unless (IO.read(header) == hdr rescue false) open(header, "wb") do |hfile| hfile.write(hdr) Index: ruby_1_9_3/version.h =================================================================== --- ruby_1_9_3/version.h (revision 34659) +++ ruby_1_9_3/version.h (revision 34660) @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 132 +#define RUBY_PATCHLEVEL 133 #define RUBY_RELEASE_DATE "2012-02-17" #define RUBY_RELEASE_YEAR 2012 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/