diff options
| author | Araq <rumpf_a@web.de> | 2013-06-27 21:41:53 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2013-06-27 21:41:53 +0200 |
| commit | 86d64b2f5efb03e34cf97c64524f1e49657a63ec (patch) | |
| tree | a8546436a5c3e01ccb8d5c021e931696cc6d3d92 /koch.nim | |
| parent | b6f2902905443434ca6d83556168555ab9ddee72 (diff) | |
| download | Nim-86d64b2f5efb03e34cf97c64524f1e49657a63ec.tar.gz | |
attempt to make libzip work on the testing machines
Diffstat (limited to 'koch.nim')
| -rw-r--r-- | koch.nim | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/koch.nim b/koch.nim index 883fffb6d..30ad8c597 100644 --- a/koch.nim +++ b/koch.nim @@ -64,13 +64,16 @@ proc tryExec(cmd: string): bool = echo(cmd) result = execShellCmd(cmd) == 0 +const + compileNimInst = "-d:useLibzipSrc tools/niminst/niminst" + proc csource(args: string) = - exec("nimrod cc $1 -r tools/niminst/niminst --var:version=$2 csource compiler/nimrod.ini $1" % - [args, NimrodVersion]) + exec("nimrod cc $1 -r $3 --var:version=$2 csource compiler/nimrod.ini $1" % + [args, NimrodVersion, compileNimInst]) proc zip(args: string) = - exec("nimrod cc -r tools/niminst/niminst --var:version=$# zip compiler/nimrod.ini" % - NimrodVersion) + exec("nimrod cc -r $2 --var:version=$1 zip compiler/nimrod.ini" % + [NimrodVersion, compileNimInst]) proc buildTool(toolname, args: string) = exec("nimrod cc $# $#" % [args, toolname]) @@ -85,9 +88,9 @@ proc inno(args: string) = NimrodVersion) proc install(args: string) = - exec("nimrod cc -r tools/niminst/niminst --var:version=$# scripts compiler/nimrod.ini" % - NimrodVersion) - exec("sh ./install.sh $#" % args) + exec("nimrod cc -r $# --var:version=$# scripts compiler/nimrod.ini" % + [compileNimInst, NimrodVersion]) + exec("sh ./install.sh $#" % args) proc web(args: string) = exec(("nimrod cc -r tools/nimweb.nim web/nimrod --putenv:nimrodversion=$#" & |