From 1b542e732077f763f12c51b4f31992060ff24fba Mon Sep 17 00:00:00 2001 From: alaviss Date: Thu, 28 Feb 2019 20:46:35 +0700 Subject: [PATCH] compiler/[main,docgen]: don't put generated doc in subfolder (#10754) * compiler/[main,docgen]: don't put generated doc in subfolder Fixes regression caused by ca4b971bc81b2e751e0388d80896fde7079b1679. foo.nim will now generates foo.html instead of foo/foo.html * compiler/[main,docgen]: map -o to -outdir for project This reinstantiate the old behavior of -o for project-wide docgen --- compiler/docgen.nim | 4 +++- compiler/main.nim | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler/docgen.nim b/compiler/docgen.nim index 28d53533f..e6847cad3 100644 --- a/compiler/docgen.nim +++ b/compiler/docgen.nim @@ -992,7 +992,9 @@ proc writeOutputJson*(d: PDoc, useWarning = false) = "\" for writing") proc commandDoc*(cache: IdentCache, conf: ConfigRef) = - conf.outDir = AbsoluteDir(conf.outDir / conf.outFile) + if optWholeProject in conf.globalOptions: + # Backward compatibility with previous versions + conf.outDir = AbsoluteDir(conf.outDir / conf.outFile) var ast = parseFile(conf.projectMainIdx, cache, conf) if ast == nil: return var d = newDocumentor(conf.projectFull, cache, conf) diff --git a/compiler/main.nim b/compiler/main.nim index 282f7d814..154252bf3 100644 --- a/compiler/main.nim +++ b/compiler/main.nim @@ -63,7 +63,9 @@ proc commandCheck(graph: ModuleGraph) = when not defined(leanCompiler): proc commandDoc2(graph: ModuleGraph; json: bool) = - graph.config.outDir = AbsoluteDir(graph.config.outDir / graph.config.outFile) + if optWholeProject in graph.config.globalOptions: + # Backward compatibility with previous versions + graph.config.outDir = AbsoluteDir(graph.config.outDir / graph.config.outFile) graph.config.errorMax = high(int) # do not stop after first error semanticPasses(graph) if json: registerPass(graph, docgen2JsonPass)