groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: avoid collected source list for groovydoc from being overwritten
Date Thu, 26 Apr 2018 13:10:52 GMT
Repository: groovy
Updated Branches:
  refs/heads/master ebebbb31f -> 3e2035ac3


avoid collected source list for groovydoc from being overwritten


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

Branch: refs/heads/master
Commit: 3e2035ac34d0143de138d8f31aff0337779c3b18
Parents: ebebbb3
Author: Paul King <paulk@asert.com.au>
Authored: Thu Apr 26 23:10:17 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Thu Apr 26 23:10:17 2018 +1000

----------------------------------------------------------------------
 gradle/docs.gradle | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/3e2035ac/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index ac4fc7d..4c0d0d0 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -37,7 +37,6 @@ def javadocSpec = {
         docTitle = doc.title
         locale = 'en_US'
         encoding = 'UTF-8'
-        author = true
         version = true
         overview = rootProject.file('src/main/java/overviewj.html')
         footer = doc.footer
@@ -48,10 +47,8 @@ def javadocSpec = {
     }
 }
 
-def groovydocSpec = {
+def groovydocBaseSpec = {
     use = true
-    source = project.sourceSets.main.allSource
-    classpath = javadoc.classpath
     ext.windowtitle = doc.title
     ext.doctitle = doc.title
     header = doc.title
@@ -66,6 +63,11 @@ def groovydocSpec = {
     link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.'
 }
 
+def groovydocSpec = groovydocBaseSpec >> {
+    source = project.sourceSets.main.allSource
+    classpath = javadoc.classpath
+}
+
 allprojects {
     javadoc javadocSpec
     groovydoc groovydocSpec
@@ -100,7 +102,7 @@ groovydocAll {
         groovyClasspath += sp.groovydoc.groovyClasspath
     }
 }
-groovydocAll groovydocSpec
+groovydocAll groovydocBaseSpec
 
 // when docgenerator is run by the build, it requires a groovy-release-info file
 // but the file is only generated by the 'jar' task, so as a workaround, we copy


Mime
View raw message