Author: hlship
Date: Fri Jun 10 00:44:28 2011
New Revision: 1134148

URL: http://svn.apache.org/viewvc?rev=1134148&view=rev
Log:
TAP5-116: Tweak Gradle code for assembling the files for JavaDoc

Modified:
    tapestry/tapestry5/trunk/build.gradle

Modified: tapestry/tapestry5/trunk/build.gradle
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/build.gradle?rev=1134148&r1=1134147&r2=1134148&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/build.gradle (original)
+++ tapestry/tapestry5/trunk/build.gradle Fri Jun 10 00:44:28 2011
@@ -138,31 +138,23 @@ task aggregateJavadoc(type: Javadoc) {
        exclude "org/apache/tapestry5/internal/plastic/asm/**"
    }
 
-   subprojects.each { subProject->
-
-       subProject.sourceSets.each { set ->
-    
-           if ("test" != set.name) {
-               source set.java
-
-               if (classpath) {
-                   classpath += set.classes + set.compileClasspath
-               }
-               else {
-                   classpath = set.classes + set.compileClasspath
-               }
-                              
-               // Some of the component .xdoc files refer to PNG images
-               // (we could also exclude .java and .xdoc)
-               copy {
-                 from set.java.srcDirs.toList()                 
-                 into javadocBuildDir.dir
-                 include '**/*.png'
-               }
-           }
-       }
+   subprojects.each { sp -> 
+     sp.sourceSets.all.findAll { set -> set.name != "test" }.each { set ->
+       
+       source set.java
+
+       classpath += set.classes + set.compileClasspath
+
+       // Some of the component .xdoc files refer to PNG images
+       // (we could also exclude .java and .xdoc)
+       copy {
+         from set.java.srcDirs.toList()                 
+         into javadocBuildDir.dir
+         include '**/*.png'
+       }       
+     }
    }
-}
+ }
 
 task clean(type: Delete) {
   delete buildDirName


Reply via email to