kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mkmf.rb: log messages

Browse source 
* lib/mkmf.rb (xsystem, xpopen, egrep_cpp, pkg_config): log
  messages to the log file too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-11-03 07:52:22 +00:00
parent a3ee54f8a6
commit 6d57a52685
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/mkmf.rb
View file

@ -382,7 +382,9 @@ module MakeMakefile
nil while command.gsub!(varpat) {vars[$1||$2]} nil while command.gsub!(varpat) {vars[$1||$2]}
end end
Logging::open do Logging::open do
puts command.quote msg = command.quote
puts msg
Logging.message "%s\n", msg
if opts and opts[:werror] if opts and opts[:werror]
result = nil result = nil
Logging.postpone do |log| Logging.postpone do |log|
@ -399,11 +401,15 @@ module MakeMakefile
def xpopen command, *mode, &block def xpopen command, *mode, &block
Logging::open do Logging::open do
case mode[0] msg = case mode[0]
when nil, /^r/ when nil, /^r/
puts "#{command} |" "#{command} |"
else else
puts "| #{command}" "| #{command}"
end
if msg
puts msg
Logging.message "%s\n", msg
end end
IO.popen(libpath_env, command, *mode, &block) IO.popen(libpath_env, command, *mode, &block)
end end
@ -808,13 +814,16 @@ SRC
xpopen(cpp_command('', opt)) do |f| xpopen(cpp_command('', opt)) do |f|
if Regexp === pat if Regexp === pat
puts(" ruby -ne 'print if #{pat.inspect}'") puts(" ruby -ne 'print if #{pat.inspect}'")
Logging::message(" ruby -ne 'print if %p'\n", pat)
f.grep(pat) {|l| f.grep(pat) {|l|
puts "#{f.lineno}: #{l}" puts "#{f.lineno}: #{l}"
Logging::message "%d: %s", f.lineno, l
return true return true
} }
false false
else else
puts(" egrep '#{pat}'") puts(" egrep '#{pat}'")
Logging::message(" egrep '%s'\n", pat)
begin begin
stdin = $stdin.dup stdin = $stdin.dup
$stdin.reopen(f) $stdin.reopen(f)
@ -1792,7 +1801,7 @@ SRC
pkgconfig = $PKGCONFIG pkgconfig = $PKGCONFIG
get = proc {|opt| get = proc {|opt|
opt = xpopen("#{$PKGCONFIG} --#{opt} #{pkg}", err:[:child, :out], &:read) opt = xpopen("#{$PKGCONFIG} --#{opt} #{pkg}", err:[:child, :out], &:read)
Logging.open {puts opt.each_line.map{|s|"=> #{s.inspect}"}} Logging.open {opt.each_line.map{|s|Logging.message "=> %p\n", s}}
opt.strip if $?.success? opt.strip if $?.success?
} }
elsif find_executable0(pkgconfig = "#{pkg}-config") elsif find_executable0(pkgconfig = "#{pkg}-config")
@ -1803,7 +1812,7 @@ SRC
if pkgconfig if pkgconfig
get ||= proc {|opt| get ||= proc {|opt|
opt = xpopen("#{pkgconfig} --#{opt}", err:[:child, :out], &:read) opt = xpopen("#{pkgconfig} --#{opt}", err:[:child, :out], &:read)
Logging.open {puts opt.each_line.map{|s|"=> #{s.inspect}"}} Logging.open {opt.each_line.map{|s|Logging.message "=> %p\n", s}}
opt.strip if $?.success? opt.strip if $?.success?
} }
end end