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

zipfile generation works again

Browse source
This commit is contained in:
Araq 2014-10-12 03:13:12 +02:00
commit ca4c64dd72
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
koch.nim
View file

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

8
tools/niminst/niminst.nim
View file

@ -503,9 +503,9 @@ when haveZipLib:
else: n = c.outdir / n else: n = c.outdir / n
var z: TZipArchive var z: TZipArchive
if open(z, n, fmWrite): if open(z, n, fmWrite):
addFile(z, proj / buildBatFile32, buildBatFile32) addFile(z, proj / buildBatFile32, "build" / buildBatFile32)
addFile(z, proj / buildBatFile64, buildBatFile64) addFile(z, proj / buildBatFile64, "build" / buildBatFile64)
addFile(z, proj / buildShFile, buildShFile) addFile(z, proj / buildShFile, "build" / buildShFile)
addFile(z, proj / installShFile, installShFile) addFile(z, proj / installShFile, installShFile)
addFile(z, proj / deinstallShFile, deinstallShFile) addFile(z, proj / deinstallShFile, deinstallShFile)
for f in walkFiles(c.libpath / "lib/*.h"): for f in walkFiles(c.libpath / "lib/*.h"):
@ -513,7 +513,7 @@ when haveZipLib:
for osA in 1..c.oses.len: for osA in 1..c.oses.len:
for cpuA in 1..c.cpus.len: for cpuA in 1..c.cpus.len:
var dir = buildDir(osA, cpuA) 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) if k == pcFile: addFile(z, proj / dir / extractFilename(f), f)
for cat in items({fcConfig..fcOther, fcUnix}): for cat in items({fcConfig..fcOther, fcUnix}):