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

Merge branch 'nimscript-support' of github.com:nim-lang/nimble into nimscript-support

Browse source
This commit is contained in:
Dominik Picheta 2015-12-22 17:27:33 +00:00
commit 9b75a95459
1 changed files with 34 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/nimble.nim
View file

@ -1021,7 +1021,10 @@ proc doAction(options: Options) =
# re-read it from the compiler. # re-read it from the compiler.
# TODO: It doesn't appear that this actually happens, can we just remove this? # TODO: It doesn't appear that this actually happens, can we just remove this?
var command = compiler_options.command.parseActionType() var command = compiler_options.command.parseActionType()
var doLoop = true
while doLoop:
doLoop = false
let cmd = compiler_options.command.normalize
case command case command
of actionUpdate: of actionUpdate:
update(options) update(options)
@ -1047,8 +1050,11 @@ proc doAction(options: Options) =
publish(pkgInfo) publish(pkgInfo)
of actionDump: of actionDump:
dump(options) dump(options)
of actionNil, actionCustom: of actionNil: discard "assuming nimscript 'nop' command here"
assert false of actionCustom:
# calls Nimscript as a side effect :-/
discard getPkgInfo(getCurrentDir())
doLoop = cmd != compiler_options.command.normalize
when isMainModule: when isMainModule:
when defined(release): when defined(release):