Got Java 8 Javadoc working

Mark Perry · Mark Perry · commit 6c86d4fafc60 · 2014-06-03T16:07:09.000+10:00
diff --git a/build.gradle b/build.gradle
@@ -1,4 +1,6 @@
 
+import org.apache.tools.ant.taskdefs.condition.Os
+
 defaultTasks 'build'
 
 ext {
@@ -12,7 +14,10 @@ if (JavaVersion.current().isJava8Compatible()) {
     }
 }
 
+
 allprojects {
+
+
 	ext {
         isSnapshot = true
         fjBaseVersion = "4.2"
@@ -43,4 +48,7 @@ allprojects {
 
 subprojects {
 
+
+
+
 }
diff --git a/core/build.gradle b/core/build.gradle
@@ -15,6 +15,8 @@ apply plugin: 'maven'
 //apply plugin: 'signing'
 apply plugin: 'retrolambda'
 
+apply from: "$rootDir/lib.gradle"
+
 defaultTasks 'build'
 
 jar {
@@ -34,17 +36,19 @@ dependencies {
     testCompile "junit:junit:4.11"
 }
 
+task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
+}
 
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
     oldJdk System.getenv("JAVA7_HOME")
     javaVersion JavaVersion.VERSION_1_7
 }
 
-//task javadocJar(type: Jar, dependsOn: javadoc) {
-//    classifier = 'javadoc'
-//    from "build/docs/javadoc"
-//}
+task javadocJar(type: Jar, dependsOn: java8Javadoc) {
+    classifier = 'javadoc'
+    from "build/docs/javadoc"
+}
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
@@ -53,7 +57,7 @@ task sourcesJar(type: Jar) {
 
 artifacts {
     archives jar
-//    archives javadocJar
+    archives javadocJar
     archives sourcesJar
 }
 
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -13,6 +13,7 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'application'
 apply plugin: 'retrolambda'
+apply from: "$rootDir/lib.gradle"
 
 defaultTasks 'build'
 
@@ -27,6 +28,11 @@ repositories {
     mavenCentral()
 }
 
+//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
+task javadoc(type: Javadoc, overwrite: true) {
+    def t = createDynamicJavadoc("$projectDir", ["core"])
+    dependsOn(t)
+}
 
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
diff --git a/java8/build.gradle b/java8/build.gradle
@@ -12,12 +12,23 @@ buildscript {
 apply plugin: 'java'
 apply plugin: 'retrolambda'
 
+apply from: "$rootDir/lib.gradle"
+
 defaultTasks 'build'
 
 repositories {
     mavenCentral()
 }
 
+//task javadoc(type: Javadoc, overwrite: true, dependsOn: "java8Javadoc") {
+//}
+
+task javadoc(type: Javadoc, overwrite: true) {
+    def t = createDynamicJavadoc("$projectDir", ["core"])
+//    dependsOn(":$t.name")
+    dependsOn(t)
+}
+
 retrolambda {
     jdk System.getenv("JAVA8_HOME")
     oldJdk System.getenv("JAVA7_HOME")
diff --git a/lib.gradle b/lib.gradle
@@ -0,0 +1,49 @@
+
+import org.apache.tools.ant.taskdefs.condition.Os
+
+
+String findCommand(String dir, String command) {
+    def extension = Os.isFamily(Os.FAMILY_WINDOWS) ? ".exe" : ""
+    def cmd = "$dir/$command$extension"
+    if (! new File(cmd).exists()) {
+        throw new Exception("Command $command not found in dir $dir")
+    }
+    cmd
+
+}
+
+String findJavaCommand(String s) {
+    def jh = System.getenv("JAVA8_HOME")
+    if (jh == null) {
+        throw new Exception("Environment variable JAVA8_HOME not set")
+    }
+    findCommand("$jh/bin", "javadoc")
+}
+
+List<String> projectClasses(List<String> list) {
+    list.collect {
+//        "$projectDir/../$it/src/main/java"
+        "$projectDir/../$it/build/classes/main"
+    }
+
+}
+
+def createDynamicJavadoc(String mainPath, List<String> paths) {
+    def taskName = "dynamicJava8Javadoc"
+    task "$taskName"(type: Exec) {
+        def cp = projectClasses(paths).join(";")
+        def c = findJavaCommand("javadoc")
+        commandLine c, "-sourcepath", "$mainPath/src/main/java", "-d", "$mainPath/build/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet", "-classpath", cp
+    }
+    project.tasks[taskName]
+}
+
+ext {
+    createDynamicJavadoc = this.&createDynamicJavadoc
+}
+
+task java8Javadoc(type: Exec) {
+    def c = findJavaCommand("javadoc")
+    commandLine c, "-sourcepath", "$projectDir/src/main/java", "-d", "$buildDir/docs/javadoc", "-subpackages", "fj", "-Xdoclint:none", "-quiet"
+}
+

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`	`1`
	`2`	`+import org.apache.tools.ant.taskdefs.condition.Os`
	`3`	`+`
`2`	`4`	`defaultTasks 'build'`
`3`	`5`
`4`	`6`	`ext {`
`@@ -12,7 +14,10 @@ if (JavaVersion.current().isJava8Compatible()) {`
`12`	`14`	`}`
`13`	`15`	`}`
`14`	`16`
	`17`	`+`
`15`	`18`	`allprojects {`
	`19`	`+`
	`20`	`+`
`16`	`21`	`ext {`
`17`	`22`	`isSnapshot = true`
`18`	`23`	`fjBaseVersion = "4.2"`
`@@ -43,4 +48,7 @@ allprojects {`
`43`	`48`
`44`	`49`	`subprojects {`
`45`	`50`
	`51`	`+`
	`52`	`+`
	`53`	`+`
`46`	`54`	`}`