From 1b7d8246c13c48ba8037321a000d5688a8bdb5fe Mon Sep 17 00:00:00 2001 From: Araq Date: Tue, 29 Sep 2015 20:44:12 +0200 Subject: NimScript: setCommand takes an optional project filename --- compiler/nim.nim | 2 +- compiler/scriptconfig.nim | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'compiler') diff --git a/compiler/nim.nim b/compiler/nim.nim index 51f4cae92..64c4e2026 100644 --- a/compiler/nim.nim +++ b/compiler/nim.nim @@ -48,7 +48,7 @@ proc handleCmdLine() = gProjectFull = canonicalizePath(gProjectName) except OSError: gProjectFull = gProjectName - var p = splitFile(gProjectFull) + let p = splitFile(gProjectFull) gProjectPath = p.dir gProjectName = p.name else: diff --git a/compiler/scriptconfig.nim b/compiler/scriptconfig.nim index 8499ebd98..aaa2486e5 100644 --- a/compiler/scriptconfig.nim +++ b/compiler/scriptconfig.nim @@ -105,6 +105,13 @@ proc setupVM*(module: PSym; scriptName: string): PEvalContext = setResult(a, strutils.cmpIgnoreCase(a.getString 0, a.getString 1)) cbconf setCommand: options.command = a.getString 0 + let arg = a.getString 1 + if arg.len > 0: + gProjectName = arg + try: + gProjectFull = canonicalizePath(gProjectPath / gProjectName) + except OSError: + gProjectFull = gProjectName cbconf getCommand: setResult(a, options.command) cbconf switch: -- cgit 1.4.1-2-gfad0