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

Merge branch 'devel' into another-channel-fix

Browse source
This commit is contained in:
Araq 2017-01-31 13:26:14 +01:00
commit 97d91bb6b7
2 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
config/nim.cfg
View file

@ -100,7 +100,7 @@ path="$lib/pure"
@if windows: @if windows:
#gcc.path = r"$nim\dist\mingw\bin" #gcc.path = r"$nim\dist\mingw\bin"
@if gcc: @if gcc:
#tlsEmulation:on tlsEmulation:on
@end @end
@end @end
@ -110,13 +110,7 @@ path="$lib/pure"
gcc.options.always = "-w" gcc.options.always = "-w"
gcc.cpp.options.always = "-w -fpermissive" gcc.cpp.options.always = "-w -fpermissive"
@else: @else:
@if cpu32: gcc.options.always = "-w"
gcc.options.always = "-w -m32"
gcc.options.linker = "-m32"
@else:
gcc.options.always = "-w -m64"
gcc.options.linker = "-m64"
@end
gcc.cpp.options.always = "-w -fpermissive" gcc.cpp.options.always = "-w -fpermissive"
@end @end

5
tools/nimweb.nim
View file

@ -322,11 +322,12 @@ proc buildPdfDoc(c: var TConfigData, destPath: string) =
if os.execShellCmd("pdflatex -version") != 0: if os.execShellCmd("pdflatex -version") != 0:
echo "pdflatex not found; no PDF documentation generated" echo "pdflatex not found; no PDF documentation generated"
else: else:
const pdflatexcmd = "pdflatex -interaction=nonstopmode "
for d in items(c.pdf): for d in items(c.pdf):
exec(findNim() & " rst2tex $# $#" % [c.nimArgs, d]) exec(findNim() & " rst2tex $# $#" % [c.nimArgs, d])
# call LaTeX twice to get cross references right: # call LaTeX twice to get cross references right:
exec("pdflatex " & changeFileExt(d, "tex")) exec(pdflatexcmd & changeFileExt(d, "tex"))
exec("pdflatex " & changeFileExt(d, "tex")) exec(pdflatexcmd & changeFileExt(d, "tex"))
# delete all the crappy temporary files: # delete all the crappy temporary files:
let pdf = splitFile(d).name & ".pdf" let pdf = splitFile(d).name & ".pdf"
let dest = destPath / pdf let dest = destPath / pdf