mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-05-03 04:24:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into bigbreak

Browse Source 
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
parent 5272213da4 b7befd69ba
commit c7570dcd3e
7 changed files with 61 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/niminst/niminst.nim
View File

@@ -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}):