diff options
| author | def <dennis@felsin9.de> | 2015-03-13 17:03:57 +0100 |
|---|---|---|
| committer | def <dennis@felsin9.de> | 2015-03-13 17:03:57 +0100 |
| commit | 06b986dbd58af03adf476ca3b0c8dbfbf9437c44 (patch) | |
| tree | 6f64c4020f663944719b0f079ff35aa8d2d4c02b /koch.nim | |
| parent | 02432f1052be5fb2976cd340440434eda88494e1 (diff) | |
| download | Nim-06b986dbd58af03adf476ca3b0c8dbfbf9437c44.tar.gz | |
Rename compiler/nim.ini back to compiler/installer.ini
- Niminst has a new -m/--main option to set the main file, by default ini-file with .nim extension (old behaviour) - Koch uses this to pass --main:compiler/nim.nim - Fix includes/links of website.ini
Diffstat (limited to 'koch.nim')
| -rw-r--r-- | koch.nim | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/koch.nim b/koch.nim index acfc66125..508d7e007 100644 --- a/koch.nim +++ b/koch.nim @@ -97,13 +97,13 @@ const compileNimInst = "-d:useLibzipSrc tools/niminst/niminst" proc csource(args: string) = - exec("$4 cc $1 -r $3 --var:version=$2 --var:mingw=none csource compiler/nim.ini $1" % + exec("$4 cc $1 -r $3 --var:version=$2 --var:mingw=none csource --main:compiler/nim.nim compiler/installer.ini $1" % [args, VersionAsString, compileNimInst, findNim()]) proc zip(args: string) = - exec("$3 cc -r $2 --var:version=$1 --var:mingw=none scripts compiler/nim.ini" % + exec("$3 cc -r $2 --var:version=$1 --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % [VersionAsString, compileNimInst, findNim()]) - exec("$# --var:version=$# --var:mingw=none zip compiler/nim.ini" % + exec("$# --var:version=$# --var:mingw=none --main:compiler/nim.nim zip compiler/installer.ini" % ["tools/niminst/niminst".exe, VersionAsString]) proc buildTool(toolname, args: string) = @@ -121,7 +121,7 @@ proc nsis(args: string) = " nsis compiler/nim") % [VersionAsString, $(sizeof(pointer)*8)]) proc install(args: string) = - exec("$# cc -r $# --var:version=$# --var:mingw=none scripts compiler/nim.ini" % + exec("$# cc -r $# --var:version=$# --var:mingw=none --main:compiler/nim.nim scripts compiler/installer.ini" % [findNim(), compileNimInst, VersionAsString]) exec("sh ./install.sh $#" % args) |