Merge branch 'devel' into bigbreak

Conflicts:
	compiler/ast.nim
	compiler/nimfix/prettybase.nim
	compiler/pragmas.nim
	compiler/sempass2.nim
	doc/manual.txt
	koch.nim
	lib/pure/concurrency/threadpool.nim
	web/news.txt
This commit is contained in:
Araq 2014-10-13 08:26:24 +02:00
commit c7570dcd3e
7 changed files with 61 additions and 21 deletions

View file

@ -85,9 +85,11 @@ proc csource(args: string) =
exec("$4 cc $1 -r $3 --var:version=$2 csource compiler/nim.ini $1" %
[args, NimVersion, compileNimInst, findNim()])
proc zip(args: string) =
exec("$3 cc -r $2 --var:version=$1 zip compiler/nim.ini" %
proc zip(args: string) =
exec("$3 cc -r $2 --var:version=$1 scripts compiler/nim.ini" %
[NimVersion, compileNimInst, findNim()])
exec("$# --var:version=$# zip compiler/nim.ini" %
["tools/niminst/niminst".exe, NimVersion])
proc buildTool(toolname, args: string) =
exec("$# cc $# $#" % [findNim(), args, toolname])