buildr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject buildr git commit: Avoid doubly adding generated directories
Date Tue, 22 Sep 2015 10:56:17 GMT
Repository: buildr
Updated Branches:
  refs/heads/master 4ceca8b8e -> dc32c1a95


Avoid doubly adding generated directories


Project: http://git-wip-us.apache.org/repos/asf/buildr/repo
Commit: http://git-wip-us.apache.org/repos/asf/buildr/commit/dc32c1a9
Tree: http://git-wip-us.apache.org/repos/asf/buildr/tree/dc32c1a9
Diff: http://git-wip-us.apache.org/repos/asf/buildr/diff/dc32c1a9

Branch: refs/heads/master
Commit: dc32c1a954a7bf79aa662f71f3a014913e06551a
Parents: 4ceca8b
Author: Peter Donald <peter@realityforge.org>
Authored: Tue Sep 22 20:56:12 2015 +1000
Committer: Peter Donald <peter@realityforge.org>
Committed: Tue Sep 22 20:56:12 2015 +1000

----------------------------------------------------------------------
 lib/buildr/ide/idea.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/buildr/blob/dc32c1a9/lib/buildr/ide/idea.rb
----------------------------------------------------------------------
diff --git a/lib/buildr/ide/idea.rb b/lib/buildr/ide/idea.rb
index e827396..2f06cdc 100644
--- a/lib/buildr/ide/idea.rb
+++ b/lib/buildr/ide/idea.rb
@@ -602,13 +602,13 @@ module Buildr #:nodoc:
         xml.content(:url => 'file://$MODULE_DIR$') do
           # Source folders
           [
-            {:dirs => self.main_source_directories},
+            {:dirs => (self.main_source_directories.dup - self.main_generated_source_directories)},
             {:dirs => self.main_generated_source_directories, :generated => true},
-            {:type => 'resource', :dirs => self.main_resource_directories},
+            {:type => 'resource', :dirs => (self.main_resource_directories.dup - self.main_generated_resource_directories)},
             {:type => 'resource', :dirs => self.main_generated_resource_directories,
:generated => true},
-            {:test => true, :dirs => self.test_source_directories},
+            {:test => true, :dirs => (self.test_source_directories - self.test_generated_source_directories)},
             {:test => true, :dirs => self.test_generated_source_directories, :generated
=> true},
-            {:test => true, :type => 'resource', :dirs => self.test_resource_directories},
+            {:test => true, :type => 'resource', :dirs => (self.test_resource_directories
- self.test_generated_resource_directories)},
             {:test => true, :type => 'resource', :dirs => self.test_generated_resource_directories,
:generated => true},
           ].each do |content|
             content[:dirs].map { |dir| dir.to_s }.compact.sort.uniq.each do |dir|


Mime
View raw message