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

fixes #11770

Browse source
This commit is contained in:
Araq 2019-08-16 14:48:32 +02:00
commit b9dd972c32
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
tools/finish.nim
View file

@ -17,6 +17,12 @@ type
Manual,
Success
proc expand(s: string): string =
try:
result = expandFilename(s)
except OSError, IOError:
result = s
proc unzip(): bool =
if not fileExists("dist" / mingw):
echo "Could not find ", "dist" / mingw
@ -192,19 +198,21 @@ when defined(windows):
let bits = $(sizeof(pointer)*8)
for d in dirs:
if dirExists d:
let x = expandFilename(d / "bin")
if checkGccArch(x): return x
else: incompat.add x
let x = expand(d / "bin")
if x.len != 0:
if checkGccArch(x): return x
else: incompat.add x
elif dirExists(d & bits):
let x = expandFilename((d & bits) / "bin")
if checkGccArch(x): return x
else: incompat.add x
let x = expand((d & bits) / "bin")
if x.len != 0:
if checkGccArch(x): return x
else: incompat.add x
proc main() =
when defined(windows):
let nimDesiredPath = expandFilename(getCurrentDir() / "bin")
let nimDesiredPath = expand(getCurrentDir() / "bin")
let nimbleBin = getEnv("USERPROFILE") / ".nimble" / "bin"
let nimbleDesiredPath = try: expandFilename(nimbleBin) except: nimbleBin
let nimbleDesiredPath = expand(nimbleBin)
let p = tryGetUnicodeValue(r"Environment", "Path",
HKEY_CURRENT_USER) & ";" & tryGetUnicodeValue(
r"System\CurrentControlSet\Control\Session Manager\Environment", "Path",