Skip to content

Commit

Permalink
merge revision(s) 34652:
Browse files Browse the repository at this point in the history
	* 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
  • Loading branch information
nurse committed Feb 17, 2012
1 parent 95433b2 commit d8168de
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
@@ -1,3 +1,7 @@
Fri Feb 17 12:51:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>

* lib/mkmf.rb (create_header): log the content of header.

Fri Feb 17 12:26:15 2012 CHIKANAGA Tomoyuki <nagachika00@gmail.com>

* test/readline/test_readline.rb (test_completion_proc_empty_result):
Expand Down
5 changes: 3 additions & 2 deletions lib/mkmf.rb
Expand Up @@ -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}
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit d8168de

Please sign in to comment.