diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-09-14 13:32:13 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2014-09-14 13:32:13 +0100 |
| commit | ebcaf6679b41c17f02da51559d683aedfefc2966 (patch) | |
| tree | 1de5853e952f90859a63c229c4f340766e0f596e | |
| parent | 59e5f3533bdb3f02d20a2b402fad92c2d56d50d8 (diff) | |
| parent | 1c241e17fe807f9876950731a834f502d3b87804 (diff) | |
| download | Nim-ebcaf6679b41c17f02da51559d683aedfefc2966.tar.gz | |
Merge branch 'bigbreak' of github.com:Araq/Nimrod into bigbreak
| -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) |