Merge pull request #767 from gradha/pr_fixes_run_with_out

Fixes run command with outFile
This commit is contained in:
zah
2013-12-20 04:53:42 -08:00
2 changed files with 10 additions and 3 deletions

View File

@@ -616,7 +616,8 @@ proc CallCCompiler*(projectfile: string) =
if options.outFile.len > 0:
exefile = options.outFile
if not noAbsolutePaths():
exefile = joinPath(splitFile(projectFile).dir, exefile)
if not exeFile.isAbsolute():
exefile = joinPath(splitFile(projectFile).dir, exefile)
exefile = quoteShell(exefile)
let linkOptions = getLinkOptions()
linkCmd = quoteShell(linkCmd % ["builddll", builddll,

View File

@@ -65,8 +65,14 @@ proc HandleCmdLine() =
completeCFilePath(changeFileExt(gProjectFull, "js").prependCurDir))
execExternalProgram("node " & ex & ' ' & service.arguments)
else:
var ex = quoteShell(
changeFileExt(gProjectFull, exeExt).prependCurDir)
var binPath: string
if options.outFile.len > 0:
# If the user specified an outFile path, use that directly.
binPath = options.outFile.prependCurDir
else:
# Figure out ourselves a valid binary name.
binPath = changeFileExt(gProjectFull, exeExt).prependCurDir
var ex = quoteShell(binPath)
execExternalProgram(ex & ' ' & service.arguments)
when defined(GC_setMaxPause):