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

docgen tests: patch 'nim' commands to use the currently running exe instead

Browse source
This commit is contained in:
Andreas Rumpf 2018-09-18 12:20:58 +02:00
commit 23c323ea1d
1 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/docgen.nim
View file

@ -976,10 +976,12 @@ proc commandRstAux(cache: IdentCache, conf: ConfigRef;
# Nim's convention: every path is relative to the file it was written in: # Nim's convention: every path is relative to the file it was written in:
outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename) outp = splitFile(d.filename).dir.AbsoluteDir / RelativeFile(filename)
writeFile(outp, content) writeFile(outp, content)
let cmd = cmd % quoteShell(outp) let c = if cmd.startsWith("nim "): os.getAppFilename() & cmd.substr(3)
rawMessage(conf, hintExecuting, cmd) else: cmd
if execShellCmd(cmd) != status: let c2 = c % quoteShell(outp)
rawMessage(conf, errGenerated, "executing of external program failed: " & cmd) rawMessage(conf, hintExecuting, c2)
if execShellCmd(c2) != status:
rawMessage(conf, errGenerated, "executing of external program failed: " & c2)
d.isPureRst = true d.isPureRst = true
var rst = parseRst(readFile(filen.string), filen.string, 0, 1, d.hasToc, var rst = parseRst(readFile(filen.string), filen.string, 0, 1, d.hasToc,