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

Fix miscellaneous windows issues with building

Browse source
This commit is contained in:
Joey Yakimowich-Payne 2018-07-14 22:04:03 +09:00
commit 0473e79c0b
4 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/nimgen/c2nim.nim
View file

@ -38,7 +38,7 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
for inc in gIncludes: for inc in gIncludes:
if inc.isAbsolute(): if inc.isAbsolute():
passC &= ("""{.passC: "-I\"$#\"".}""" % [inc]) & "\n" passC &= ("""{.passC: "-I\"$#\"".}""" % [inc.sanitizePath()]) & "\n"
else: else:
passC &= ( passC &= (
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" % """{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
@ -85,11 +85,10 @@ proc c2nim*(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" % passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
[fname, file.relativePath()] [fname, file.relativePath()]
extflags = "--header:header$#" % fname extflags = "--header:header$#" % fname
# Run c2nim on generated file # Run c2nim on generated file
var cmd = "c2nim $# $# --out:$# $#" % [c2nimConfig.flags, extflags, outfile, cfile] var cmd = "c2nim $# $# --out:$# $#" % [c2nimConfig.flags, extflags, outfile, cfile]
when defined(windows): when defined(windows):
cmd = "cmd /c " & cmd cmd = "cmd /c " & cmd.quoteShell
discard execProc(cmd) discard execProc(cmd)
if c2nimConfig.preprocess or c2nimConfig.ctags: if c2nimConfig.preprocess or c2nimConfig.ctags:

5
src/nimgen/external.nim
View file

@ -2,6 +2,9 @@ import os, osproc, regex, ropes, streams, strutils
import globals import globals
proc sanitizePath*(path: string): string =
path.multiReplace([("\\", "/"), ("//", "/")])
proc execProc*(cmd: string): string = proc execProc*(cmd: string): string =
result = "" result = ""
var var
@ -106,7 +109,7 @@ proc runPreprocess*(file, ppflags, flags: string, inline: bool): string =
cmd = "$# -E $# $#" % [pproc, ppflags, file] cmd = "$# -E $# $#" % [pproc, ppflags, file]
for inc in gIncludes: for inc in gIncludes:
cmd &= " -I " & inc cmd &= " -I " & inc.quoteShell
# Run preprocessor # Run preprocessor
var data = execProc(cmd) var data = execProc(cmd)

2
src/nimgen/gencore.nim
View file

@ -20,7 +20,7 @@ proc addEnv*(str: string): string =
discard discard
# if there are still format args, print a warning # if there are still format args, print a warning
if newStr.contains("${"): if newStr.contains("$") and not newStr.contains("$replace("):
echo "WARNING: \"", newStr, "\" still contains an uninterpolated value!" echo "WARNING: \"", newStr, "\" still contains an uninterpolated value!"
return newStr return newStr

3
src/nimgen/runcfg.nim
View file

@ -196,6 +196,9 @@ proc runCfg*(cfg: string) =
# Reset on a per project basis # Reset on a per project basis
gCCompiler = getEnv(cCompilerEnv, defaultCCompiler) gCCompiler = getEnv(cCompilerEnv, defaultCCompiler)
gCppCompiler = gCppCompiler.quoteShell
gCCompiler = gCCompiler.quoteShell
if gConfig["n.global"].hasKey("filter"): if gConfig["n.global"].hasKey("filter"):
gFilter = gConfig["n.global"]["filter"] gFilter = gConfig["n.global"]["filter"]
if gConfig["n.global"].hasKey("quotes"): if gConfig["n.global"].hasKey("quotes"):