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

Fixes #1583

Browse source
This commit is contained in:
Clay Sweetser 2014-10-24 02:03:35 -04:00
commit 8a53732910
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
koch.nim
View file

@ -18,6 +18,8 @@ when defined(gcc) and defined(windows):
import import
os, strutils, parseopt, osproc, streams os, strutils, parseopt, osproc, streams
import "compiler/nversion.nim"
when defined(withUpdate): when defined(withUpdate):
import httpclient import httpclient
when defined(haveZipLib): when defined(haveZipLib):
@ -91,13 +93,13 @@ const
proc csource(args: string) = proc csource(args: string) =
exec("$4 cc $1 -r $3 --var:version=$2 csource compiler/nim.ini $1" % exec("$4 cc $1 -r $3 --var:version=$2 csource compiler/nim.ini $1" %
[args, NimVersion, compileNimInst, findNim()]) [args, VersionAsString, compileNimInst, findNim()])
proc zip(args: string) = proc zip(args: string) =
exec("$3 cc -r $2 --var:version=$1 --var:mingw=mingw32 scripts compiler/nim.ini" % exec("$3 cc -r $2 --var:version=$1 --var:mingw=mingw32 scripts compiler/nim.ini" %
[NimVersion, compileNimInst, findNim()]) [VersionAsString, compileNimInst, findNim()])
exec("$# --var:version=$# --var:mingw=mingw32 zip compiler/nim.ini" % exec("$# --var:version=$# --var:mingw=mingw32 zip compiler/nim.ini" %
["tools/niminst/niminst".exe, NimVersion]) ["tools/niminst/niminst".exe, VersionAsString])
proc buildTool(toolname, args: string) = proc buildTool(toolname, args: string) =
exec("$# cc $# $#" % [findNim(), args, toolname]) exec("$# cc $# $#" % [findNim(), args, toolname])
@ -111,16 +113,16 @@ proc nsis(args: string) =
exec "nim c compiler" / "nim.nim" exec "nim c compiler" / "nim.nim"
copyExe("compiler/nim".exe, "bin/nim_debug".exe) copyExe("compiler/nim".exe, "bin/nim_debug".exe)
exec(("tools" / "niminst" / "niminst --var:version=$# --var:mingw=mingw32" & exec(("tools" / "niminst" / "niminst --var:version=$# --var:mingw=mingw32" &
" nsis compiler/nim") % NimVersion) " nsis compiler/nim") % VersionAsString)
proc install(args: string) = proc install(args: string) =
exec("$# cc -r $# --var:version=$# --var:mingw=mingw32 scripts compiler/nim.ini" % exec("$# cc -r $# --var:version=$# --var:mingw=mingw32 scripts compiler/nim.ini" %
[findNim(), compileNimInst, NimVersion]) [findNim(), compileNimInst, VersionAsString])
exec("sh ./install.sh $#" % args) exec("sh ./install.sh $#" % args)
proc web(args: string) = proc web(args: string) =
exec("$# cc -r tools/nimweb.nim $# web/nim --putenv:nimversion=$#" % exec("$# cc -r tools/nimweb.nim $# web/nim --putenv:nimversion=$#" %
[findNim(), args, NimVersion]) [findNim(), args, VersionAsString])
# -------------- boot --------------------------------------------------------- # -------------- boot ---------------------------------------------------------
@ -287,7 +289,7 @@ when defined(withUpdate):
# -------------- builds a release --------------------------------------------- # -------------- builds a release ---------------------------------------------
proc run7z(platform: string, patterns: varargs[string]) = proc run7z(platform: string, patterns: varargs[string]) =
const tmpDir = "nim-" & NimVersion const tmpDir = "nim-" & VersionAsString
createDir tmpDir createDir tmpDir
try: try:
for pattern in patterns: for pattern in patterns:
@ -331,7 +333,7 @@ proc temp(args: string) =
if args.len > 0: exec(finalDest & " " & args) if args.len > 0: exec(finalDest & " " & args)
proc showHelp() = proc showHelp() =
quit(HelpText % [NimVersion & repeatChar(44-len(NimVersion)), quit(HelpText % [VersionAsString & repeatChar(44-len(VersionAsString)),
CompileDate, CompileTime], QuitSuccess) CompileDate, CompileTime], QuitSuccess)
var op = initOptParser() var op = initOptParser()