From 6705c26b6c6cb91b4c574662678b0d2beff79842 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Thu, 30 Jan 2020 10:36:05 +0100 Subject: [PATCH] Fix #8133: Fix base URL of non snapshot site Examples * Changes `//css/dottydoc.css` to `/css/dottydoc.css` * Keeps `/0.22.0-bin-SNAPSHOT/css/dottydoc.css` as is --- doc-tool/src/dotty/tools/dottydoc/DocDriver.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala index 6431d25df856..ec8609d38134 100644 --- a/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala +++ b/doc-tool/src/dotty/tools/dottydoc/DocDriver.scala @@ -47,11 +47,11 @@ class DocDriver extends Driver { val projectLogo = Option(ctx.settings.projectLogo.value).filter(_.nonEmpty) val docSnapshot = ctx.settings.docSnapshot.value - val baseUrl = "/" + val baseUrl = "" val outDir = File(siteRoot, "_site") val snapshotFolderName = if projectVersion.endsWith("NIGHTLY") then "nightly" else projectVersion val snapshotOutDir = File(outDir, snapshotFolderName) - val snapshotBaseUrl = s"$baseUrl$snapshotFolderName" + val snapshotBaseUrl = s"$baseUrl/$snapshotFolderName" if (projectName.isEmpty) ctx.error(s"Site project name not set. Use `-project ` to set the project name")