kochdocs: compiler docs now under compiler/

nim-lang · Jan 27, 2020 · 3550d32 · 3550d32
1 parent c83649b
commit 3550d32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/compiler/docgen.nim b/compiler/docgen.nim
@@ -329,7 +329,7 @@ proc belongsToPackage(conf: ConfigRef; module: PSym): bool =
   result = module.kind == skModule and module.getnimblePkgId == conf.mainPackageId
 
 proc externalDep(d: PDoc; module: PSym): string =
-  if optWholeProject in d.conf.globalOptions:
+  if optWholeProject in d.conf.globalOptions or d.conf.docRoot.len > 0:
     let full = AbsoluteFile toFullPath(d.conf, FileIndex module.position)
     let tmp = getOutFile2(d.conf, presentationPath(d.conf, full), HtmlExt,
         RelativeDir"htmldocs", sfMainModule notin module.flags)

diff --git a/tools/kochdocs.nim b/tools/kochdocs.nim
@@ -321,8 +321,7 @@ proc buildDoc(nimArgs, destPath: string) =
   for d in items(doc):
     var nimArgs2 = nimArgs
     if d.isRelativeTo("compiler"):
-      when false: # enable this when bugs fixed
-        nimArgs2.add " --docroot:@pkg"
+      nimArgs2.add " --docroot:@pkg"
     commands[i] = nim & " doc $# --git.url:$# --outdir:$# --index:on $#" %
       [nimArgs2, gitUrl, destPath, d]
     i.inc