Make "koch docs" copy the dochack.js to the right location too

- Fixes https://github.com/nim-lang/Nim/issues/9104.
- Fixes https://github.com/nim-lang/Nim/issues/9095.

Expect dochack.js to be fetched from the doc/html/ dir instead of from
doc/.

Also remove an unused and unexported proc pathPart.
This commit is contained in:
Kaushal Modi 2018-09-28 13:12:28 -04:00
commit 2e5c759736
6 changed files with 16 additions and 15 deletions

View file

@ -7,8 +7,9 @@ const
nimArgs = "--hint[Conf]:off --hint[Path]:off --hint[Processing]:off -d:boot --putenv:nimversion=$#" % system.NimVersion
gitUrl = "https://github.com/nim-lang/Nim"
docHtmlOutput = "doc/html"
webUploadOutput = "web/upload"
docHtmlOutput = "doc" / "html"
webUploadOutput = "web" / "upload"
docHackDir = "tools" / "dochack"
proc exe*(f: string): string =
result = addFileExt(f, ExeExt)
@ -267,8 +268,6 @@ proc buildDocSamples(nimArgs, destPath: string) =
exec(findNim() & " doc $# -o:$# $#" %
[nimArgs, destPath / "docgen_sample.html", "doc" / "docgen_sample.nim"])
proc pathPart(d: string): string = splitFile(d).dir.replace('\\', '/')
proc buildDoc(nimArgs, destPath: string) =
# call nim for the documentation:
var
@ -325,11 +324,15 @@ proc buildPdfDoc*(nimArgs, destPath: string) =
proc buildJS() =
exec(findNim() & " js -d:release --out:$1 web/nimblepkglist.nim" %
[webUploadOutput / "nimblepkglist.js"])
exec(findNim() & " js tools/dochack/dochack.nim")
exec(findNim() & " js " & (docHackDir / "dochack.nim"))
proc buildDocs*(args: string) =
let a = nimArgs & " " & args
buildJS()
let
a = nimArgs & " " & args
docHackJs = "dochack.js"
docHackJsSource = docHackDir / "nimcache" / docHackJs
docHackJsDest = docHtmlOutput / docHackJs
buildJS() # This call generates docHackJsSource
let docup = webUploadOutput / NimVersion
createDir(docup)
buildDocSamples(a, docup)
@ -340,3 +343,4 @@ proc buildDocs*(args: string) =
createDir(docHtmlOutput)
buildDocSamples(nimArgs, docHtmlOutput)
buildDoc(nimArgs, docHtmlOutput)
copyFileWithPermissions(docHackJsSource, docHackJsDest)