You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2017/12/14 21:57:21 UTC

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

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/5e40de23
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/5e40de23
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/5e40de23

Branch: refs/heads/master
Commit: 5e40de2332ebb96ecd6335b7a4c5a2c9397b4b8b
Parents: 9c28945
Author: Cedric Champeau <cc...@apache.org>
Authored: Thu Dec 14 22:44:08 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Thu Dec 14 22:44:08 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/groovy/blob/5e40de23/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index ab92ad9..ca95739 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -112,7 +112,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)
     }
@@ -120,13 +120,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 ->
@@ -135,7 +135,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')