Commit bb98fd78 authored by KOBAYASHI Shuji's avatar KOBAYASHI Shuji

Use `Rake.verbose` instead of `$verbose` and `$pp_show` in build scripts

The incompatibility that the commands of `FileUtils` origin output verbose
by default due to the changes in d8a5163b and 26e6e75b is also fixed.
parent d2f34a84
...@@ -5,7 +5,7 @@ MRUBY_ROOT = File.dirname(File.expand_path(__FILE__)) ...@@ -5,7 +5,7 @@ MRUBY_ROOT = File.dirname(File.expand_path(__FILE__))
MRUBY_BUILD_HOST_IS_CYGWIN = RUBY_PLATFORM.include?('cygwin') MRUBY_BUILD_HOST_IS_CYGWIN = RUBY_PLATFORM.include?('cygwin')
MRUBY_BUILD_HOST_IS_OPENBSD = RUBY_PLATFORM.include?('openbsd') MRUBY_BUILD_HOST_IS_OPENBSD = RUBY_PLATFORM.include?('openbsd')
$verbose = Rake.verbose == true Rake.verbose(false) if Rake.verbose == Rake::DSL::DEFAULT
$LOAD_PATH << File.join(MRUBY_ROOT, "lib") $LOAD_PATH << File.join(MRUBY_ROOT, "lib")
......
...@@ -20,27 +20,8 @@ class String ...@@ -20,27 +20,8 @@ class String
end end
end end
$pp_show = true
if $verbose.nil?
if Rake.respond_to?(:verbose) && !Rake.verbose.nil?
if Rake.verbose.class == TrueClass
# verbose message logging
$pp_show = false
else
$pp_show = true
Rake.verbose(false)
end
else
# could not identify rake version
$pp_show = false
end
else
$pp_show = false if $verbose
end
def _pp(cmd, src, tgt=nil, options={}) def _pp(cmd, src, tgt=nil, options={})
return unless $pp_show return if Rake.verbose
width = 5 width = 5
template = options[:indent] ? "%#{width*options[:indent]}s %s %s" : "%-#{width}s %s %s" template = options[:indent] ? "%#{width*options[:indent]}s %s %s" : "%-#{width}s %s %s"
......
...@@ -320,7 +320,7 @@ EOS ...@@ -320,7 +320,7 @@ EOS
end end
def verbose_flag def verbose_flag
$verbose ? ' -v' : '' Rake.verbose ? ' -v' : ''
end end
def run_test def run_test
...@@ -386,7 +386,7 @@ EOS ...@@ -386,7 +386,7 @@ EOS
end end
def run_test def run_test
@test_runner.runner_options << ' -v' if $verbose @test_runner.runner_options << verbose_flag
mrbtest = exefile("#{build_dir}/bin/mrbtest") mrbtest = exefile("#{build_dir}/bin/mrbtest")
if (@test_runner.command == nil) if (@test_runner.command == nil)
puts "You should run #{mrbtest} on target device." puts "You should run #{mrbtest} on target device."
......
...@@ -342,7 +342,7 @@ module MRuby ...@@ -342,7 +342,7 @@ module MRuby
_pp "MRBC", f.relative_path, nil, :indent => 2 _pp "MRBC", f.relative_path, nil, :indent => 2
end end
cmd = "#{filename @command} #{@compile_options % {:funcname => funcname}} #{filename(infiles).join(' ')}" cmd = "#{filename @command} #{@compile_options % {:funcname => funcname}} #{filename(infiles).join(' ')}"
print("#{cmd}\n") if $verbose puts cmd if Rake.verbose
IO.popen(cmd, 'r+') do |io| IO.popen(cmd, 'r+') do |io|
out.puts io.read out.puts io.read
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment