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

Minor bugfixes

Browse source
This commit is contained in:
Ganesh Viswanathan 2018-03-13 17:05:40 -05:00
commit 6d0abefe8a
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -36,6 +36,8 @@ To see examples of nimgen in action check out the following wrappers:-
* download ZIP with headers and binary * download ZIP with headers and binary
* Compile C code into binary * Compile C code into binary
* [nimbigwig](https://github.com/genotrance/nimbigwig) - libbigWig wrapper
* git checkout
* [nimfuzz](https://github.com/genotrance/nimfuzz) - fts_fuzzy_match wrapper * [nimfuzz](https://github.com/genotrance/nimfuzz) - fts_fuzzy_match wrapper
* download header file * download header file
* [nimkerberos](https://github.com/genotrance/nimkerberos) - WinKerberos wrapper * [nimkerberos](https://github.com/genotrance/nimkerberos) - WinKerberos wrapper

9
nimgen.nim
View file

@ -283,7 +283,8 @@ proc getIncls(file: string, inline=false): seq[string] =
for f in content.findIter(re"(?m)^\s*#\s*include\s+(.*?)$"): for f in content.findIter(re"(?m)^\s*#\s*include\s+(.*?)$"):
var inc = f.captures[0].strip() var inc = f.captures[0].strip()
if ((QUOTES and inc.contains("\"")) or (FILTER != "" and FILTER in inc)) and (not exclude(inc)): if ((QUOTES and inc.contains("\"")) or (FILTER != "" and FILTER in inc)) and (not exclude(inc)):
result.add(inc.replace(re"""[<>"]""", "").strip()) result.add(
inc.replace(re"""[<>"]""", "").replace(re"\/[\*\/].*$", "").strip())
result = result.deduplicate() result = result.deduplicate()
@ -337,6 +338,8 @@ proc runPreprocess(file, ppflags, flags: string, inline: bool): string =
start = false start = false
if sfile in line.replace("\\", "/").replace("//", "/"): if sfile in line.replace("\\", "/").replace("//", "/"):
start = true start = true
if not ("\\" in line) and not ("/" in line) and extractFilename(sfile) in line:
start = true
else: else:
if start: if start:
rdata.add( rdata.add(
@ -641,9 +644,9 @@ proc runCfg(cfg: string) =
let (key, val) = getKey(wild) let (key, val) = getKey(wild)
if val == true: if val == true:
if key == "wildcard": if key == "wildcard":
wildcard = CONFIG["n.wildcard"][key] wildcard = CONFIG["n.wildcard"][wild]
else: else:
WILDCARDS.setSectionKey(wildcard, key, CONFIG["n.wildcard"][key]) WILDCARDS.setSectionKey(wildcard, wild, CONFIG["n.wildcard"][wild])
for file in CONFIG.keys(): for file in CONFIG.keys():
if file in @["n.global", "n.include", "n.exclude", "n.prepare", "n.wildcard"]: if file in @["n.global", "n.include", "n.exclude", "n.prepare", "n.wildcard"]:

2
nimgen.nimble
View file

@ -1,6 +1,6 @@
# Package # Package
version = "0.1.4" version = "0.1.5"
author = "genotrance" author = "genotrance"
description = "c2nim helper to simplify and automate the wrapping of C libraries" description = "c2nim helper to simplify and automate the wrapping of C libraries"
license = "MIT" license = "MIT"

4
tests/nimgentest.nims
View file

@ -2,13 +2,13 @@ import distros
import ospaths import ospaths
import strutils import strutils
var comps = @["libsvm", "nimbass", "nimfuzz", "nimrax", "nimssl", "nimssh2"] var comps = @["libsvm", "nimbass", "nimbigwig", "nimfuzz", "nimrax", "nimssl", "nimssh2"]
if detectOs(Windows): if detectOs(Windows):
comps.add("nimkerberos") comps.add("nimkerberos")
for comp in comps: for comp in comps:
if dirExists(".."/comp): if dirExists(".."/comp):
exec "nimble uninstall -y " & comp exec "nimble uninstall -y " & comp, "", ""
withDir(".."/comp): withDir(".."/comp):
rmDir(comp) rmDir(comp)
exec "nimble install -y" exec "nimble install -y"