From 7707c4c36902bac16a6e0318990ee7ff197f1cd9 Mon Sep 17 00:00:00 2001 From: def Date: Thu, 12 Mar 2015 13:50:07 +0100 Subject: [PATCH] Move installer.ini back to nim.ini to fix ./koch csource --- compiler/{installer.ini => nim.ini} | 0 doc/niminst.txt | 2 +- koch.nim | 8 ++++---- 3 files changed, 5 insertions(+), 5 deletions(-) rename compiler/{installer.ini => nim.ini} (100%) diff --git a/compiler/installer.ini b/compiler/nim.ini similarity index 100% rename from compiler/installer.ini rename to compiler/nim.ini diff --git a/doc/niminst.txt b/doc/niminst.txt index ca05cc514..d743c5187 100644 --- a/doc/niminst.txt +++ b/doc/niminst.txt @@ -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: diff --git a/koch.nim b/koch.nim index 34cb1317d..a391ede7c 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/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)