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

Merge branch 'jyapayne-fix_includes'

Browse source
This commit is contained in:
Ganesh Viswanathan 2018-07-08 16:02:16 -05:00
commit 0bda8084dd
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
nimgen.nim
View file

@ -438,6 +438,9 @@ proc runCtags(file: string): string =
proc runFile(file: string, cfgin: OrderedTableRef) proc runFile(file: string, cfgin: OrderedTableRef)
template relativePath(path: untyped): untyped =
path.multiReplace([(gOutput, ""), ("\\", "/"), ("//", "/")])
proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) = proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
var file = search(fl) var file = search(fl)
if file == "": if file == "":
@ -487,14 +490,19 @@ proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
outlib = "" outlib = ""
outpragma = "" outpragma = ""
passC = "import strutils\n" passC = "import ospaths, strutils\n"
for inc in gIncludes: for inc in gIncludes:
passC &= ("""{.passC: "-I\"" & gorge("nimble path $#").strip() & "/$#\"".}""" % [gOutput, inc]) & "\n" passC &= (
"""{.passC: "-I\"" & currentSourcePath().splitPath().head & "$#\"".}""" %
inc.relativePath()
) & "\n"
for prag in c2nimConfig.pragma: for prag in c2nimConfig.pragma:
outpragma &= "{." & prag & ".}\n" outpragma &= "{." & prag & ".}\n"
let fname = file.splitFile().name.replace(re"[\.\-]", "_") let fname = file.splitFile().name.replace(re"[\.\-]", "_")
if c2nimConfig.dynlib.len() != 0: if c2nimConfig.dynlib.len() != 0:
let let
win = "when defined(Windows):\n" win = "when defined(Windows):\n"
@ -524,7 +532,8 @@ proc c2nim(fl, outfile: string, c2nimConfig: c2nimConfigObj) =
if outlib != "": if outlib != "":
extflags &= " --dynlib:dynlib$#" % fname extflags &= " --dynlib:dynlib$#" % fname
else: else:
passC &= "const header$# = \"$#\"\n" % [fname, fl] passC &= "const header$# = currentSourcePath().splitPath().head & \"$#\"\n" %
[fname, file.relativePath()]
extflags = "--header:header$#" % fname extflags = "--header:header$#" % fname
# Run c2nim on generated file # Run c2nim on generated file