Move installer.ini back to nim.ini to fix ./koch csource

This commit is contained in:
def
2015-03-12 13:50:07 +01:00
parent 0a0126d49a
commit 7707c4c369
3 changed files with 5 additions and 5 deletions

View File

@@ -190,6 +190,6 @@ Real world example
The installers for the Nim compiler itself are generated by niminst. Have a
look at its configuration file:
.. include:: compiler/installer.ini
.. include:: compiler/nim.ini
:literal:

View File

@@ -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/installer.ini $1" %
exec("$4 cc $1 -r $3 --var:version=$2 --var:mingw=none csource compiler/nim.ini $1" %
[args, VersionAsString, compileNimInst, findNim()])
proc zip(args: string) =
exec("$3 cc -r $2 --var:version=$1 --var:mingw=none scripts compiler/installer.ini" %
exec("$3 cc -r $2 --var:version=$1 --var:mingw=none scripts compiler/nim.ini" %
[VersionAsString, compileNimInst, findNim()])
exec("$# --var:version=$# --var:mingw=none zip compiler/installer.ini" %
exec("$# --var:version=$# --var:mingw=none zip compiler/nim.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/installer.ini" %
exec("$# cc -r $# --var:version=$# --var:mingw=none scripts compiler/nim.ini" %
[findNim(), compileNimInst, VersionAsString])
exec("sh ./install.sh $#" % args)