[56/62] [abbrv] groovy git commit: Avoid copying resources into docgenerator sourceset

[cc...@apache.org]

Avoid copying resources into docgenerator sourceset


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

Branch: refs/heads/GROOVY_2_6_X
Commit: 52b67fc41c1022eff0eeeed4d55d9d139bd8bceb
Parents: 41133d7
Author: Cedric Champeau <cc...@apache.org>
Authored: Thu Dec 14 22:44:08 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sun Dec 17 14:52:26 2017 +0100

----------------------------------------------------------------------
 gradle/docs.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/52b67fc4/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 483bb23..0f4c123 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -111,7 +111,7 @@ groovydocAll groovydocSpec
 // but the file is only generated by the 'jar' task, so as a workaround, we copy
 // it into the docgenerator classes
 task docProjectVersionInfo(type: Copy) {
-    destinationDir = file("${project(':groovy-docgenerator').sourceSets.main.java.outputDir}")
+    destinationDir = file("${buildDir}/docgenerator-resources")
     into('META-INF') {
         from(generateReleaseInfo)
     }
@@ -119,13 +119,13 @@ task docProjectVersionInfo(type: Copy) {
 }
 
 task docGDK {
-//    ext.extraDocGDKclasses = []
+    outputs.cacheIf { true }
     dependsOn([project(':groovy-groovydoc'), project(':groovy-docgenerator')]*.classes)
     // TODO don't hard-code these
     dependsOn([project(':groovy-nio'), project(':groovy-sql'), project(':groovy-xml'), project(':groovy-swing')]*.classes)
     dependsOn docProjectVersionInfo
     ext.destinationDir = "$buildDir/html/groovy-jdk"
-    inputs.files sourceSets.main.runtimeClasspath + configurations.tools
+    inputs.files sourceSets.main.runtimeClasspath + configurations.tools + files(docProjectVersionInfo.destinationDir)
     outputs.dir destinationDir
     def docGeneratorPath = files(project(':groovy-docgenerator').sourceSets.main.output.classesDirs)
     doLast { task ->
@@ -134,7 +134,7 @@ task docGDK {
                 java(classname: 'org.codehaus.groovy.tools.DocGenerator',
                      fork: 'true',
                      failonerror: 'true',
-                     classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath + docGeneratorPath).asPath,
+                     classpath: (sourceSets.main.runtimeClasspath + rootProject.files(docProjectVersionInfo.destinationDir) + configurations.tools + groovydocAll.groovyClasspath + docGeneratorPath).asPath,
                      errorproperty: 'edr',
                      outputproperty: 'odr') {
                     arg(value: '-title')