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

renamed babelcmd to nimblecmd; config files are now nim.cfg; other renamings

Browse source
This commit is contained in:
Araq 2014-08-29 09:03:00 +02:00
commit cd2c6128d1
25 changed files with 187 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/nimconf.nim
View file

@ -224,8 +224,8 @@ proc loadConfigs*(cfg: string) =
if libpath == "":
# choose default libpath:
var prefix = getPrefixDir()
if prefix == "/usr": libpath = "/usr/lib/nimrod"
elif prefix == "/usr/local": libpath = "/usr/local/lib/nimrod"
if prefix == "/usr": libpath = "/usr/lib/nim"
elif prefix == "/usr/local": libpath = "/usr/local/lib/nim"
else: libpath = joinPath(prefix, "lib")
if optSkipConfigFile notin gGlobalOptions:
@ -244,5 +244,6 @@ proc loadConfigs*(cfg: string) =
if gProjectName.len != 0:
# new project wide config file:
readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))
let projectConfig = changeFileExt(gProjectFull, "nim.cfg")
if fileExists(projectConfig): readConfigFile(projectConfig)
else: readConfigFile(changeFileExt(gProjectFull, "nimrod.cfg"))