diff options
| -rw-r--r-- | dottydoc/jvm/src/dotty/tools/dottydoc/core/Phases.scala | 8 | ||||
| -rw-r--r-- | dottydoc/jvm/test/WhitelistedStdLibMain.scala | 2 | ||||
| -rw-r--r-- | src/dotty/tools/dotc/config/ScalaSettings.scala | 7 |
3 files changed, 15 insertions, 2 deletions
diff --git a/dottydoc/jvm/src/dotty/tools/dottydoc/core/Phases.scala b/dottydoc/jvm/src/dotty/tools/dottydoc/core/Phases.scala index 745c8302f..e569a706a 100644 --- a/dottydoc/jvm/src/dotty/tools/dottydoc/core/Phases.scala +++ b/dottydoc/jvm/src/dotty/tools/dottydoc/core/Phases.scala @@ -142,7 +142,13 @@ object Phases { commentParser.parse(packages) // (4) Write the finished model to JSON - if (!ctx.settings.YDocNoWrite.value) util.IndexWriters.writeJs(packages, "../js/out") + val outputDir = { + val out = ctx.settings.DocOutput.value + if (out.last == '/') out.dropRight(1) + else out + } + assert(outputDir == "../js/out") + if (!ctx.settings.YDocNoWrite.value) util.IndexWriters.writeJs(packages, outputDir) // (5) Clear caches commentParser.clear() diff --git a/dottydoc/jvm/test/WhitelistedStdLibMain.scala b/dottydoc/jvm/test/WhitelistedStdLibMain.scala index f4a2f9dc6..d4c8206a9 100644 --- a/dottydoc/jvm/test/WhitelistedStdLibMain.scala +++ b/dottydoc/jvm/test/WhitelistedStdLibMain.scala @@ -19,5 +19,5 @@ object WhitelistedStandardLib extends DottyDoc { } override def main(args: Array[String]) = - super.main("-language:Scala2" +: files.toArray) + super.main("-language:Scala2" +: "-Ydoc-output" +: "../js/out" +: files.toArray) } diff --git a/src/dotty/tools/dotc/config/ScalaSettings.scala b/src/dotty/tools/dotc/config/ScalaSettings.scala index 0cc08d3cd..fa4059a96 100644 --- a/src/dotty/tools/dotc/config/ScalaSettings.scala +++ b/src/dotty/tools/dotc/config/ScalaSettings.scala @@ -214,6 +214,13 @@ class ScalaSettings extends Settings.SettingGroup { "" ) + val DocOutput = StringSetting ( + "-Ydoc-output", + "outdir", + "The output directory in which to place the documentation", + "." + ) + val DocFooter = StringSetting ( "-Ydoc-footer", "footer", |