Author: donaldp
Date: Sat Oct 27 21:18:43 2012
New Revision: 1402875
URL: http://svn.apache.org/viewvc?rev=1402875&view=rev
Log:
Rework the way "verbose" output is emitted to match that as emitted in 1.4.6
Buildr differs in it's interpretation of this flag from Rake in the
interpretation of the unset state. Unset the flag indicates non-verbose output
from file tasks but verbose output from buildr tasks.
Modified:
buildr/trunk/lib/buildr.rb
buildr/trunk/lib/buildr/core/util.rb
Modified: buildr/trunk/lib/buildr.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr.rb?rev=1402875&r1=1402874&r2=1402875&view=diff
==============================================================================
--- buildr/trunk/lib/buildr.rb (original)
+++ buildr/trunk/lib/buildr.rb Sat Oct 27 21:18:43 2012
@@ -20,7 +20,6 @@ end
require 'rake'
include Rake::DSL
Rake::TaskManager.record_task_metadata = true
-Rake::FileUtilsExt.verbose_flag = false
require 'rbconfig'
require 'pathname'
Modified: buildr/trunk/lib/buildr/core/util.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=1402875&r1=1402874&r2=1402875&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Sat Oct 27 21:18:43 2012
@@ -308,7 +308,7 @@ if Buildr::Util.java_platform?
module RakeFileUtils #:nodoc:
def rake_merge_option(args, defaults)
- defaults[:verbose] = false if defaults[:verbose] == :default
+ defaults[:verbose] = false if defaults[:verbose] ==
Rake::FileUtilsExt::DEFAULT
if Hash === args.last
defaults.update(args.last)
@@ -396,7 +396,7 @@ if Buildr::Util.java_platform?
ok or fail "Command failed with status (#{status.exitstatus}):
[#{show_command}]"
}
end
- if RakeFileUtils.verbose_flag == :default
+ if RakeFileUtils.verbose_flag == Rake::FileUtilsExt::DEFAULT
options[:verbose] = false
else
options[:verbose] ||= RakeFileUtils.verbose_flag
@@ -440,7 +440,7 @@ else
ok or fail "Command failed with status (#{status.exitstatus}):
[#{show_command}]"
}
end
- if RakeFileUtils.verbose_flag == :default
+ if RakeFileUtils.verbose_flag == Rake::FileUtilsExt::DEFAULT
options[:verbose] = false
else
options[:verbose] ||= RakeFileUtils.verbose_flag
