empty

rjolly · Feb 19, 2020 · c0b2eae · c0b2eae
1 parent ebba93d
commit c0b2eae
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/init.js b/init.js
@@ -47,20 +47,14 @@ function javac(srcDir, destDir) {
     apps.get("Tools").compile(fileset(srcDir, ".*\.java"), pathToFile(destDir), ["-source", "1.7", "-target", "1.7"]);
 }
 
-function classpath() {
-    return java.lang.System.getProperty("java.class.path");
-}
-
 function javadoc(srcDir, destDir) {
     if (srcDir == undefined) {
 	srcDir = ".";
     }
     if (destDir == undefined) {
 	destDir = srcDir;
     }
-    var files = fileset(srcDir, ".*\.java");
-    var dir = pathToFile(destDir);
-    Packages.com.sun.tools.javadoc.Main.execute(["-classpath", classpath(), "-d", dir].concat(files));
+    apps.get("Tools").javadoc(fileset(srcDir, ".*\.java"), pathToFile(destDir));
 }
 
 function copy(src, dest, pattern) {
@@ -405,6 +399,10 @@ function ps2pdf(file, output) {
     IOUtils.closeQuietly(fos);
 }
 
+function classpath() {
+    return java.lang.System.getProperty("java.class.path");
+}
+
 // requires ch.epfl.lamp#dotty-compiler_0.22;0.22.0-RC1
 
 function dotc(srcDir, destDir, options) {

diff --git a/src/main/java/linoleum/Tools.java b/src/main/java/linoleum/Tools.java
@@ -18,6 +18,7 @@
 import java.util.jar.Manifest;
 import java.util.jar.Attributes;
 import javax.tools.JavaCompiler;
+import javax.tools.DocumentationTool;
 import javax.tools.StandardJavaFileManager;
 import javax.tools.StandardLocation;
 import javax.tools.ToolProvider;
@@ -44,6 +45,15 @@ public void compile(final File files[], final File destDir, final String options
 		}
 	}
 
+	public void javadoc(final File files[], final File destDir) throws IOException {
+		final DocumentationTool tool = ToolProvider.getSystemDocumentationTool();
+		try (final StandardJavaFileManager fileManager = tool.getStandardFileManager(null, null, null)) {
+			fileManager.setLocation(DocumentationTool.Location.DOCUMENTATION_OUTPUT, Arrays.asList(new File[] {destDir}));
+			final DocumentationTool.DocumentationTask task = tool.getTask(null, fileManager, null, null, null, fileManager.getJavaFileObjectsFromFiles(Arrays.asList(files)));
+			task.call();
+		}
+	}
+
 	public void mklink(final File link, final File target) throws IOException {
 		final Path s = target.toPath();
 		final Path d = link.toPath();