mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-08 22:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #4289

Browse Source
This commit is contained in:
Andreas Rumpf
2016-06-08 16:05:21 +02:00
parent a2345702f8
commit fb0df95015
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/niminst/niminst.nim
View File

@@ -202,35 +202,35 @@ proc parseCmdLine(c: var ConfigData) =
if c.infile.len == 0: quit(Usage)
if c.mainfile.len == 0: c.mainfile = changeFileExt(c.infile, "nim")
proc ignoreFile(f, root: string, preventHtml: bool): bool =
proc ignoreFile(f, root: string, allowHtml: bool): bool =
let (_, name, ext) = splitFile(f)
let html = if preventHtml: ".html" else: ""
let html = if not allowHtml: ".html" else: ""
let explicit = splitPath(root).tail
result = (ext in ["", ".exe", ".idx"] or
ext == html or name[0] == '.') and f != explicit
ext == html or name[0] == '.') and name & ext != explicit
proc walkDirRecursively(s: var seq[string], root: string,
preventHtml: bool) =
allowHtml: bool) =
let tail = splitPath(root).tail
if tail == "nimcache" or tail[0] == '.':
return
let preventHtml = preventHtml or tail != "doc"
let allowHtml = allowHtml or tail == "doc"
for k, f in walkDir(root):
if f[0] == '.' and root[0] != '.':
discard "skip .git directories etc"
else:
case k
of pcFile, pcLinkToFile:
if not ignoreFile(f, root, preventHtml):
if not ignoreFile(f, root, allowHtml):
add(s, unixToNativePath(f))
of pcDir:
walkDirRecursively(s, f, preventHtml)
walkDirRecursively(s, f, allowHtml)
of pcLinkToDir: discard
proc addFiles(s: var seq[string], patterns: seq[string]) =
for p in items(patterns):
if existsDir(p):
walkDirRecursively(s, p, true)
walkDirRecursively(s, p, false)
else:
var i = 0
for f in walkFiles(p):