diff options
| author | Araq <rumpf_a@web.de> | 2014-10-12 03:13:12 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2014-10-12 03:13:12 +0200 |
| commit | ca4c64dd72646abec1b9683bb422f8cb2ca81ad7 (patch) | |
| tree | 8552a5462cfa387972c4707d0ea932fac9d17d10 | |
| parent | 399c985b62b35e7d81149ceef5d9a51fdeac35ed (diff) | |
| download | Nim-ca4c64dd72646abec1b9683bb422f8cb2ca81ad7.tar.gz | |
zipfile generation works again
| -rw-r--r-- | koch.nim | 6 | ||||
| -rw-r--r-- | tools/niminst/niminst.nim | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/koch.nim b/koch.nim index dff6ede98..b7cf65ff7 100644 --- a/koch.nim +++ b/koch.nim @@ -84,9 +84,11 @@ proc csource(args: string) = exec("$4 cc $1 -r $3 --var:version=$2 csource compiler/nimrod.ini $1" % [args, NimrodVersion, compileNimInst, findNim()]) -proc zip(args: string) = - exec("$3 cc -r $2 --var:version=$1 zip compiler/nimrod.ini" % +proc zip(args: string) = + exec("$3 cc -r $2 --var:version=$1 scripts compiler/nimrod.ini" % [NimrodVersion, compileNimInst, findNim()]) + exec("$# --var:version=$# zip compiler/nimrod.ini" % + ["tools/niminst/niminst".exe, NimrodVersion]) proc buildTool(toolname, args: string) = exec("$# cc $# $#" % [findNim(), args, toolname]) diff --git a/tools/niminst/niminst.nim b/tools/niminst/niminst.nim index bf8a7a84f..50b3dacc3 100644 --- a/tools/niminst/niminst.nim +++ b/tools/niminst/niminst.nim @@ -503,9 +503,9 @@ when haveZipLib: else: n = c.outdir / n var z: TZipArchive if open(z, n, fmWrite): - addFile(z, proj / buildBatFile32, buildBatFile32) - addFile(z, proj / buildBatFile64, buildBatFile64) - addFile(z, proj / buildShFile, buildShFile) + addFile(z, proj / buildBatFile32, "build" / buildBatFile32) + addFile(z, proj / buildBatFile64, "build" / buildBatFile64) + addFile(z, proj / buildShFile, "build" / buildShFile) addFile(z, proj / installShFile, installShFile) addFile(z, proj / deinstallShFile, deinstallShFile) for f in walkFiles(c.libpath / "lib/*.h"): @@ -513,7 +513,7 @@ when haveZipLib: for osA in 1..c.oses.len: for cpuA in 1..c.cpus.len: var dir = buildDir(osA, cpuA) - for k, f in walkDir(dir): + for k, f in walkDir("build" / dir): if k == pcFile: addFile(z, proj / dir / extractFilename(f), f) for cat in items({fcConfig..fcOther, fcUnix}): |