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

Merge pull request #348 from antizealot1337/seqstringarg

Browse source 
Change buildFromDir to accept a seq[string] instead of a string.
This commit is contained in:
Dominik Picheta 2017-08-12 11:18:41 +01:00 • committed by GitHub
commit b47f174748
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/nimble.nim
View file

@ -285,14 +285,14 @@ proc processDeps(pkginfo: PackageInfo, options: Options): seq[string] =
for i in reverseDeps: for i in reverseDeps:
addRevDep(options, i, pkginfo) addRevDep(options, i, pkginfo)
proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], args: var string) = proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], args: var seq[string]) =
## Builds a package as specified by ``pkgInfo``. ## Builds a package as specified by ``pkgInfo``.
if pkgInfo.bin.len == 0: if pkgInfo.bin.len == 0:
raise newException(NimbleError, raise newException(NimbleError,
"Nothing to build. Did you specify a module to build using the" & "Nothing to build. Did you specify a module to build using the" &
" `bin` key in your .nimble file?") " `bin` key in your .nimble file?")
let realDir = pkgInfo.getRealDir() let realDir = pkgInfo.getRealDir()
for path in paths: args.add(" --path:\"" & path & "\" ") for path in paths: args.add("--path:\"" & path & "\" ")
for bin in pkgInfo.bin: for bin in pkgInfo.bin:
let outputOpt = "-o:\"" & pkgInfo.getOutputDir(bin) & "\"" let outputOpt = "-o:\"" & pkgInfo.getOutputDir(bin) & "\""
display("Building", "$1/$2 using $3 backend" % display("Building", "$1/$2 using $3 backend" %
@ -304,7 +304,7 @@ proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], args: var string) =
try: try:
doCmd("\"" & getNimBin() & "\" $# --noBabelPath $# $# \"$#\"" % doCmd("\"" & getNimBin() & "\" $# --noBabelPath $# $# \"$#\"" %
[pkgInfo.backend, args, outputOpt, [pkgInfo.backend, join(args, " "), outputOpt,
realDir / bin.changeFileExt("nim")]) realDir / bin.changeFileExt("nim")])
except NimbleError: except NimbleError:
let currentExc = (ref NimbleError)(getCurrentException()) let currentExc = (ref NimbleError)(getCurrentException())
@ -316,7 +316,11 @@ proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], args: var string) =
raise exc raise exc
proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], forRelease: bool) = proc buildFromDir(pkgInfo: PackageInfo, paths: seq[string], forRelease: bool) =
var args = if forRelease: "-d:release" else: "" var args: seq[string]
if forRelease:
args = @["-d:release"]
else:
args = @[]
buildFromDir(pkgInfo, paths, args) buildFromDir(pkgInfo, paths, args)
proc saveNimbleMeta(pkgDestDir, url, vcsRevision: string, proc saveNimbleMeta(pkgDestDir, url, vcsRevision: string,
@ -637,7 +641,7 @@ proc build(options: Options) =
var pkgInfo = getPkgInfo(getCurrentDir(), options) var pkgInfo = getPkgInfo(getCurrentDir(), options)
nimScriptHint(pkgInfo) nimScriptHint(pkgInfo)
let paths = processDeps(pkginfo, options) let paths = processDeps(pkginfo, options)
var args = join(options.action.compileOptions, " ") var args = options.action.compileOptions
buildFromDir(pkgInfo, paths, args) buildFromDir(pkgInfo, paths, args)
proc execBackend(options: Options) = proc execBackend(options: Options) =