From d8168dedeff4affc0bccd53ecb9d500280fa5d2d Mon Sep 17 00:00:00 2001 From: naruse Date: Fri, 17 Feb 2012 04:24:39 +0000 Subject: merge revision(s) 34652: * lib/mkmf.rb (create_header): log the content of header. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/mkmf.rb | 5 +++-- version.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e87ec9acdc..12edc3e131 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Feb 17 12:51:25 2012 Nobuyoshi Nakada + + * lib/mkmf.rb (create_header): log the content of header. + Fri Feb 17 12:26:15 2012 CHIKANAGA Tomoyuki * test/readline/test_readline.rb (test_completion_proc_empty_result): diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 686a61fb96..8254cd31f7 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -331,11 +331,11 @@ def xpopen command, *mode, &block 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 @@ def create_header(header = "extconf.h") 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) diff --git a/version.h b/version.h index 83c047164d..9c5dfbb84e 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3