diff options
| author | Araq <rumpf_a@web.de> | 2014-12-23 17:54:32 +0100 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-12-23 17:54:32 +0100 |
| commit | ea4160b23ff154000b79b554c40565875c59a216 (patch) | |
| tree | a511f387c8d67f16ea536744ba3e2cc594b992db /tools | |
| parent | c0cc62c6b17710e6d961198da79a0587e538735f (diff) | |
| parent | c5eed51fd01b7a462989e1a8fe0fa31112ae3772 (diff) | |
| download | Nim-ea4160b23ff154000b79b554c40565875c59a216.tar.gz | |
Merge branch 'devel' of https://github.com/Araq/Nimrod into devel
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/nimweb.nim | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/nimweb.nim b/tools/nimweb.nim index d56b6aecf..74f561b52 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -268,18 +268,18 @@ proc buildDoc(c: var TConfigData, destPath: string) = commands = newSeq[string](len(c.doc) + len(c.srcdoc) + len(c.srcdoc2)) i = 0 for d in items(c.doc): - commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim rst2html $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc for d in items(c.srcdoc): - commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc for d in items(c.srcdoc2): - commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$#/$# -o:$# --index:on $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(d).dir, + commands[i] = "nim doc2 $# --docSeeSrcUrl:$#/$# -o:$# --index:on $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(d).name, "html"), d] i.inc @@ -311,8 +311,8 @@ proc buildAddDoc(c: var TConfigData, destPath: string) = # build additional documentation (without the index): var commands = newSeq[string](c.webdoc.len) for i, doc in pairs(c.webdoc): - commands[i] = "nim doc $# --docSeeSrcUrl:$#/$#/$# -o:$# $#" % - [c.nimArgs, c.gitRepo, c.gitCommit, splitFile(doc).dir, + commands[i] = "nim doc $# --docSeeSrcUrl:$#/$# -o:$# $#" % + [c.nimArgs, c.gitRepo, c.gitCommit, destPath / changeFileExt(splitFile(doc).name, "html"), doc] mexec(commands, c.numProcessors) |