From 23e270b603eb32472b8ef4a5f44c01af57fd049f Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 23 Nov 2015 18:53:18 +0100 Subject: Use Java 8 Path API to relativize paths instead of rolling a custom version. Fixes various IOExceptions thrown during generation. --- src/Utilities/Path.kt | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/Utilities') diff --git a/src/Utilities/Path.kt b/src/Utilities/Path.kt index 36277d9f..05838499 100644 --- a/src/Utilities/Path.kt +++ b/src/Utilities/Path.kt @@ -1,19 +1,5 @@ package org.jetbrains.dokka import java.io.File -import java.io.IOException - -fun File.getRelativePath(name: File): File { - val parent = parentFile ?: throw IOException("No common directory") - - val basePath = canonicalPath + File.separator; - val targetPath = name.canonicalPath; - - if (targetPath.startsWith(basePath)) { - return File(targetPath.substring(basePath.length)) - } else { - return File(".." + File.separator + parent.getRelativePath(name)) - } -} fun File.appendExtension(extension: String) = if (extension.isEmpty()) this else File(path + "." + extension) -- cgit From 90cf2ebccd12073a55ff6f187e5a378a2e96e23b Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 23 Nov 2015 19:21:08 +0100 Subject: Copy style.css to the output directory when doing HTML and use relative paths. Fixes the code so that the relative path to root is always available, breaking the requirement to use a local web server. --- src/Utilities/DokkaModule.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Utilities') diff --git a/src/Utilities/DokkaModule.kt b/src/Utilities/DokkaModule.kt index 3b2d26f1..1eb82313 100644 --- a/src/Utilities/DokkaModule.kt +++ b/src/Utilities/DokkaModule.kt @@ -26,7 +26,7 @@ class DokkaModule(val environment: AnalysisEnvironment, binder.bind(LanguageService::class.java).to(KotlinLanguageService::class.java) binder.bind(HtmlTemplateService::class.java).toProvider(object : Provider { - override fun get(): HtmlTemplateService = HtmlTemplateService.default("/dokka/styles/style.css") + override fun get(): HtmlTemplateService = HtmlTemplateService.default("style.css") }) binder.registerCategory("language") -- cgit