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/16 21:49:36 UTC
groovy git commit: Fix overlapping outputs for asciidoc task
Repository: groovy
Updated Branches:
refs/heads/master b836c2cff -> 088b7190a
Fix overlapping outputs for asciidoc task
This fixes the build cache issue and makes it much faster to rebuild. Note that the full
documentation now lives into the `target/asciidocAll` directory.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/088b7190
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/088b7190
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/088b7190
Branch: refs/heads/master
Commit: 088b7190ae6e09a3e1fee3b64f845678b84feada
Parents: b836c2c
Author: Cedric Champeau <cc...@apache.org>
Authored: Sat Dec 16 22:48:22 2017 +0100
Committer: Cedric Champeau <cc...@apache.org>
Committed: Sat Dec 16 22:48:22 2017 +0100
----------------------------------------------------------------------
gradle/asciidoctor.gradle | 1 -
gradle/assemble.gradle | 2 +-
gradle/docs.gradle | 13 ++++++-------
3 files changed, 7 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/088b7190/gradle/asciidoctor.gradle
----------------------------------------------------------------------
diff --git a/gradle/asciidoctor.gradle b/gradle/asciidoctor.gradle
index b4775e3..0718f5e 100644
--- a/gradle/asciidoctor.gradle
+++ b/gradle/asciidoctor.gradle
@@ -74,7 +74,6 @@ asciidoctor.onlyIf { project.file('src/spec/doc').exists() }
task asciidoctorAssets(type:Copy) {
from project.fileTree('src/spec/assets')
into "${asciidoctor.outputDir}/html5/assets"
- into "${rootProject.asciidoctor.outputDir}/html5/assets"
}
asciidoctor.finalizedBy asciidoctorAssets
http://git-wip-us.apache.org/repos/asf/groovy/blob/088b7190/gradle/assemble.gradle
----------------------------------------------------------------------
diff --git a/gradle/assemble.gradle b/gradle/assemble.gradle
index 55c1a8b..4443dcb 100644
--- a/gradle/assemble.gradle
+++ b/gradle/assemble.gradle
@@ -63,7 +63,7 @@ ext.docSpec = copySpec {
from groovydocAll.destinationDir
}
into('html/documentation') {
- from "$buildDir/asciidoc/html5"
+ from "$buildDir/asciidocAll/html5"
}
into('html/groovy-jdk') {
from docGDK.destinationDir
http://git-wip-us.apache.org/repos/asf/groovy/blob/088b7190/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index ca95739..0f4c123 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -19,21 +19,20 @@
task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) {
if (JavaVersion.current().java7Compatible) {
- dependsOn 'asciidocAll', 'assembleAsciidoc'
+ dependsOn 'asciidocAll'
}
ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation. All rights reserved.'
ext.title = "Groovy ${groovyVersion}"
}
if (JavaVersion.current().java7Compatible) {
- task assembleAsciidoc(type: Copy, dependsOn: 'asciidocAll') {
- subprojects {
- from project.asciidoctor
+ task asciidocAll(type: Copy) {
+ allprojects {
+ dependsOn asciidoctor
+ from asciidoctor.outputDir
}
- into "$buildDir/asciidoc"
+ into "$buildDir/asciidocAll"
}
-
- task asciidocAll(dependsOn: {allprojects.asciidoctor})
}
def javadocSpec = {