mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-07-20 07:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

patchFile: support properly

Browse Source
This commit is contained in:
Andreas Rumpf
2016-07-14 10:54:31 +02:00
parent 6dddb3e68e
commit 0867c62ded
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/scriptconfig.nim
View File

@@ -16,7 +16,7 @@ import
os, times, osproc, wordrecg, strtabs
# we support 'cmpIgnoreStyle' natively for efficiency:
from strutils import cmpIgnoreStyle
from strutils import cmpIgnoreStyle, contains
proc listDirs(a: VmArgs, filter: set[PathComponent]) =
let dir = getString(a, 0)
@@ -125,8 +125,10 @@ proc setupVM*(module: PSym; scriptName: string): PEvalContext =
cbconf patchFile:
let key = a.getString(0) & "_" & a.getString(1)
var val = a.getString(2).addFileExt(NimExt)
if not isAbsolute(val):
val = vthisDir / pathSubs(val, vthisDir)
if {'$', '~'} in val:
val = pathSubs(val, vthisDir)
elif not isAbsolute(val):
val = vthisDir / val
gModuleOverrides[key] = val
proc runNimScript*(scriptName: string; freshDefines=true) =