jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nimweb compiles again

Browse source
This commit is contained in:
Araq 2014-09-14 14:29:35 +02:00
commit 1c241e17fe
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/nimweb.nim
View file

@ -300,14 +300,9 @@ proc buildPdfDoc(c: var TConfigData, destPath: string) =
proc buildAddDoc(c: var TConfigData, destPath: string) = proc buildAddDoc(c: var TConfigData, destPath: string) =
# build additional documentation (without the index): # build additional documentation (without the index):
<<<<<<< HEAD
var commands = newSeq[string](c.webdoc.len) var commands = newSeq[string](c.webdoc.len)
for i, doc in pairs(c.webdoc): for i, doc in pairs(c.webdoc):
commands[i] = "nimrod doc $# --docSeeSrcUrl:$# -o:$# $#" % commands[i] = "nim doc $# --docSeeSrcUrl:$# -o:$# $#" %
=======
for d in items(c.webdoc):
exec("nim doc $# --docSeeSrcUrl:$# -o:$# $#" %
>>>>>>> 0047172274a73c681f619f5cd60aaad7109f694d
[c.nimrodArgs, c.gitCommit, [c.nimrodArgs, c.gitCommit,
destPath / changeFileExt(splitFile(doc).name, "html"), doc] destPath / changeFileExt(splitFile(doc).name, "html"), doc]
mexec(commands, c.numProcessors) mexec(commands, c.numProcessors)