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:07:17 UTC
[1/2] groovy git commit: Fix doc generation
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_6_X 25db53004 -> 8dd4a1a09
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/bae6a5c6
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/bae6a5c6
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/bae6a5c6
Branch: refs/heads/GROOVY_2_6_X
Commit: bae6a5c6f0092e5c6bed92ce250897b13369c473
Parents: 25db530
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 23:05:24 2017 +0100
----------------------------------------------------------------------
gradle/docs.gradle | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/bae6a5c6/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index f9992ba..242f439 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').buildDir}/classes/main")
+ destinationDir = file("${project(':groovy-docgenerator').sourceSets.main.java.outputDir}")
into('META-INF') {
from('src/resources/META-INF/groovy-release-info.properties') {
filter(rootProject.propertiesFilter, org.apache.tools.ant.filters.ReplaceTokens)
@@ -130,13 +130,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')
[2/2] groovy git commit: Cache ensureGrammars task
Posted by cc...@apache.org.
Cache ensureGrammars task
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/8dd4a1a0
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/8dd4a1a0
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/8dd4a1a0
Branch: refs/heads/GROOVY_2_6_X
Commit: 8dd4a1a09457216f6c9e0d32d61ee8dc137c2303
Parents: bae6a5c
Author: Cedric Champeau <cc...@apache.org>
Authored: Tue Dec 12 23:06:54 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Tue Dec 12 23:06:54 2017 +0100
----------------------------------------------------------------------
build.gradle | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/8dd4a1a0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 1b3628e..179509f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -359,6 +359,7 @@ compileJava {
}
task ensureGrammars {
+ outputs.cacheIf { true }
description = 'Ensure all the Antlr2 generated files are up to date.'
ext.antlrDirectory = "$projectDir/src/main/org/codehaus/groovy/antlr"
ext.groovyParserDirectory = "$ext.antlrDirectory/parser"