diff options
| author | Araq <rumpf_a@web.de> | 2014-09-14 14:29:35 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-09-14 14:29:35 +0200 |
| commit | 1c241e17fe807f9876950731a834f502d3b87804 (patch) | |
| tree | a2a5d25b01b3773aa2c1a6eca86a0fc793bc4c68 | |
| parent | d330a72a4565353bd3ad54ade0580d53cd9d5a5d (diff) | |
| download | Nim-1c241e17fe807f9876950731a834f502d3b87804.tar.gz | |
nimweb compiles again
| -rw-r--r-- | tools/nimweb.nim | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/nimweb.nim b/tools/nimweb.nim index c6602d884..8744a250e 100644 --- a/tools/nimweb.nim +++ b/tools/nimweb.nim @@ -300,14 +300,9 @@ proc buildPdfDoc(c: var TConfigData, destPath: string) = proc buildAddDoc(c: var TConfigData, destPath: string) = # build additional documentation (without the index): -<<<<<<< HEAD var commands = newSeq[string](c.webdoc.len) for i, doc in pairs(c.webdoc): - commands[i] = "nimrod doc $# --docSeeSrcUrl:$# -o:$# $#" % -======= - for d in items(c.webdoc): - exec("nim doc $# --docSeeSrcUrl:$# -o:$# $#" % ->>>>>>> 0047172274a73c681f619f5cd60aaad7109f694d + commands[i] = "nim doc $# --docSeeSrcUrl:$# -o:$# $#" % [c.nimrodArgs, c.gitCommit, destPath / changeFileExt(splitFile(doc).name, "html"), doc] mexec(commands, c.numProcessors) |