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

fix setCommand so it behaves like regular nim invocation (#18555)

Browse source
This commit is contained in:
Timothee Cour 2021-07-21 23:00:29 -07:00 • committed by GitHub
commit d5b5827bc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/cmdlinehelper.nim
View file

@ -44,14 +44,7 @@ proc processCmdLineAndProjectPath*(self: NimProg, conf: ConfigRef) =
elif self.supportsStdinFile and conf.projectName == "-": elif self.supportsStdinFile and conf.projectName == "-":
handleStdinInput(conf) handleStdinInput(conf)
elif conf.projectName != "": elif conf.projectName != "":
try: setFromProjectName(conf, conf.projectName)
conf.projectFull = canonicalizePath(conf, AbsoluteFile conf.projectName)
except OSError:
conf.projectFull = AbsoluteFile conf.projectName
let p = splitFile(conf.projectFull)
let dir = if p.dir.isEmpty: AbsoluteDir getCurrentDir() else: p.dir
conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile dir)
conf.projectName = p.name
else: else:
conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile getCurrentDir()) conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile getCurrentDir())

10
compiler/options.nim
View file

@ -695,6 +695,16 @@ proc setDefaultLibpath*(conf: ConfigRef) =
proc canonicalizePath*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile = proc canonicalizePath*(conf: ConfigRef; path: AbsoluteFile): AbsoluteFile =
result = AbsoluteFile path.string.expandFilename result = AbsoluteFile path.string.expandFilename
proc setFromProjectName*(conf: ConfigRef; projectName: string) =
try:
conf.projectFull = canonicalizePath(conf, AbsoluteFile projectName)
except OSError:
conf.projectFull = AbsoluteFile projectName
let p = splitFile(conf.projectFull)
let dir = if p.dir.isEmpty: AbsoluteDir getCurrentDir() else: p.dir
conf.projectPath = AbsoluteDir canonicalizePath(conf, AbsoluteFile dir)
conf.projectName = p.name
proc removeTrailingDirSep*(path: string): string = proc removeTrailingDirSep*(path: string): string =
if (path.len > 0) and (path[^1] == DirSep): if (path.len > 0) and (path[^1] == DirSep):
result = substr(path, 0, path.len - 2) result = substr(path, 0, path.len - 2)

11
compiler/scriptconfig.nim
View file

@ -151,18 +151,9 @@ proc setupVM*(module: PSym; cache: IdentCache; scriptName: string;
setResult(a, strutils.cmpIgnoreCase(a.getString 0, a.getString 1)) setResult(a, strutils.cmpIgnoreCase(a.getString 0, a.getString 1))
cbconf setCommand: cbconf setCommand:
conf.setCommandEarly(a.getString 0) conf.setCommandEarly(a.getString 0)
# xxx move remaining logic to commands.nim or other
let arg = a.getString 1 let arg = a.getString 1
incl(conf.globalOptions, optWasNimscript) incl(conf.globalOptions, optWasNimscript)
if arg.len > 0: if arg.len > 0: setFromProjectName(conf, arg)
conf.projectName = arg
let path =
if conf.projectName.isAbsolute: AbsoluteFile(conf.projectName)
else: conf.projectPath / RelativeFile(conf.projectName)
try:
conf.projectFull = canonicalizePath(conf, path)
except OSError:
conf.projectFull = path
cbconf getCommand: cbconf getCommand:
setResult(a, conf.command) setResult(a, conf.command)
cbconf switch: cbconf switch: