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/12 22:08:03 UTC
[20/20] groovy git commit: Fix doc generation
Fix doc generation
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c12757b6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c12757b6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c12757b6
Branch: refs/heads/GROOVY_2_5_X
Commit: c12757b6295f2fd8dc2ee00154dac777c77b2618
Parents: 4716b7b
Author: Cedric Champeau <cc...@apache.org>
Authored: Tue Dec 12 22:58:18 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Tue Dec 12 22:58:18 2017 +0100
----------------------------------------------------------------------
gradle/docs.gradle | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c12757b6/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 6e78da2..e7eab50 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -111,9 +111,9 @@ 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').buildDir}/classes/main")
+ destinationDir = file("${project(':groovy-docgenerator').sourceSets.main.java.outputDir}")
into('META-INF') {
- from('src/main/META-INF/groovy-release-info.properties') {
+ from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
}
}
@@ -129,13 +129,14 @@ task docGDK {
ext.destinationDir = "$buildDir/html/groovy-jdk"
inputs.files sourceSets.main.runtimeClasspath + configurations.tools
outputs.dir destinationDir
+ def docGeneratorPath = files(project(':groovy-docgenerator').sourceSets.main.output.classesDirs)
doLast { task ->
try {
ant {
java(classname: 'org.codehaus.groovy.tools.DocGenerator',
fork: 'true',
failonerror: 'true',
- classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath).asPath,
+ classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath + docGeneratorPath).asPath,
errorproperty: 'edr',
outputproperty: 'odr') {
arg(value: '-title')