Implement nimLibPrefix config var and add better messages for it.
This commit is contained in:
parent
c271435a84
commit
6354132959
3 changed files with 24 additions and 3 deletions
|
|
@ -11,6 +11,7 @@ type
|
|||
packageLists*: Table[string, PackageList] ## Names -> packages.json files
|
||||
cloneUsingHttps*: bool # Whether to replace git:// for https://
|
||||
httpProxy*: Uri # Proxy for package list downloads.
|
||||
nimLibPrefix*: string # Nim stdlib prefix.
|
||||
|
||||
PackageList* = object
|
||||
name*: string
|
||||
|
|
@ -33,6 +34,8 @@ proc initConfig(): Config =
|
|||
])
|
||||
result.packageLists["official"] = defaultPkgList
|
||||
|
||||
result.nimLibPrefix = ""
|
||||
|
||||
proc initPackageList(): PackageList =
|
||||
result.name = ""
|
||||
result.urls = @[]
|
||||
|
|
@ -110,6 +113,8 @@ proc parseConfig*(): Config =
|
|||
else:
|
||||
currentPackageList.path = e.value
|
||||
else: assert false
|
||||
of "nimlibprefix":
|
||||
result.nimLibPrefix = e.value
|
||||
else:
|
||||
raise newException(NimbleError, "Unable to parse config file:" &
|
||||
" Unknown key: " & e.key)
|
||||
|
|
|
|||
|
|
@ -191,11 +191,19 @@ proc setupVM(module: PSym; scriptName: string, flags: Flags): PEvalContext =
|
|||
proc isValidLibPath(lib: string): bool =
|
||||
return fileExists(lib / "system.nim")
|
||||
|
||||
proc getNimPrefixDir: string =
|
||||
proc getNimPrefixDir(options: Options): string =
|
||||
let env = getEnv("NIM_LIB_PREFIX")
|
||||
if env != "":
|
||||
let msg = "Using env var NIM_LIB_PREFIX: " & env
|
||||
display("Warning:", msg, Warning, HighPriority)
|
||||
return env
|
||||
|
||||
if options.config.nimLibPrefix != "":
|
||||
result = options.config.nimLibPrefix
|
||||
let msg = "Using Nim stdlib prefix from Nimble config file: " & result
|
||||
display("Warning:", msg, Warning, HighPriority)
|
||||
return
|
||||
|
||||
result = splitPath(findExe("nim")).head.parentDir
|
||||
# The above heuristic doesn't work for 'choosenim' proxies. Thankfully in
|
||||
# that case the `nimble` binary is beside the `nim` binary so things should
|
||||
|
|
@ -222,10 +230,14 @@ proc execScript(scriptName: string, flags: Flags, options: Options): PSym =
|
|||
compiler_options.implicitImports.add("nimblepkg/nimscriptapi")
|
||||
|
||||
# Ensure the compiler can find its standard library #220.
|
||||
compiler_options.gPrefixDir = getNimPrefixDir()
|
||||
compiler_options.gPrefixDir = getNimPrefixDir(options)
|
||||
display("Setting", "Nim stdlib prefix to " & compiler_options.gPrefixDir,
|
||||
priority=LowPriority)
|
||||
|
||||
# Verify that lib path points to existing stdlib.
|
||||
compiler_options.setDefaultLibpath()
|
||||
display("Setting", "Nim stdlib path to " & compiler_options.libpath,
|
||||
priority=LowPriority)
|
||||
if not isValidLibPath(compiler_options.libpath):
|
||||
let msg = "Nimble cannot find Nim's standard library.\nLast try in:\n - $1" %
|
||||
compiler_options.libpath
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue