Repository: buildr Updated Branches: refs/heads/master 84a948b39 -> 677156e53
Ensure that the 'source_paths' property in the pmd addon does not arrays or nils. Project: http://git-wip-us.apache.org/repos/asf/buildr/repo Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/677156e5 Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/677156e5 Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/677156e5 Branch: refs/heads/master Commit: 677156e53b639cec91081178eefd1bba6759d4e2 Parents: 84a948b Author: Peter Donald <[email protected]> Authored: Fri Jul 25 07:17:50 2014 +1000 Committer: Peter Donald <[email protected]> Committed: Fri Jul 25 07:17:50 2014 +1000 ---------------------------------------------------------------------- CHANGELOG | 2 ++ addon/buildr/single_intermediate_layout.rb | 3 +++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/buildr/blob/677156e5/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 7e04869..9e683d5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,6 @@ 1.4.20 (Pending) +* Fixed: Ensure that the 'single_intermediate_layout' addon removes the top + level target and reports directories during 'clean' phase. * Fixed: Ensure that the 'source_paths' property in the pmd addon does not arrays or nils. http://git-wip-us.apache.org/repos/asf/buildr/blob/677156e5/addon/buildr/single_intermediate_layout.rb ---------------------------------------------------------------------- diff --git a/addon/buildr/single_intermediate_layout.rb b/addon/buildr/single_intermediate_layout.rb index b61527a..adefccd 100644 --- a/addon/buildr/single_intermediate_layout.rb +++ b/addon/buildr/single_intermediate_layout.rb @@ -45,6 +45,7 @@ module Buildr #nodoc parent = parent.parent end + # Should we enhance top level clean task for "#{top_dir}/target" and "#{top_dir}/reports"? target_dir = "#{top_dir}/target/#{name.gsub(':', '_')}" reports_dir = "#{top_dir}/reports/#{name.gsub(':', '_')}" target_dir = ::Buildr::Util.relative_path(target_dir, File.expand_path(base_dir)) @@ -60,6 +61,8 @@ module Buildr #nodoc if top_dir == base_dir && project.iml? project.iml.excluded_directories << "#{base_dir}/target" project.iml.excluded_directories << "#{base_dir}/reports" + clean { rm_rf "#{base_dir}/target" } + clean { rm_rf "#{base_dir}/reports" } end project end
