Multiple features

src/choosenim.nim

@@ -30,13 +30,29 @@ proc parseVersion(versionStr: string): Version =
   result = newVersion(versionStr)
 
 proc installVersion(version: Version, params: CliParams) =
+  when defined(windows):
+    # Add MingW bin dir to PATH so script can find gcc.
+    if findExe("gcc") == "" and dirExists(params.getMingwBin()):
+      let pathEnv = getEnv("PATH")
+      putEnv("PATH", params.getMingwBin() & PathSep & pathEnv)
+      defer:
+        putEnv("PATH", pathEnv)
+
   # Install the requested version.
   let path = download(version, params)
   # Extract the downloaded file.
   let extractDir = params.getInstallationDir(version)
   # Make sure no stale files from previous installation exist.
   removeDir(extractDir)
   extract(path, extractDir)
+
+  when defined(windows):
+    # Fix win binary folder to avoid /nim-0.xx.0/nim-0.xx.0
+    let winFolder = extractDir/"nim-$1" % $version
+    if dirExists(winFolder):
+      moveDirContents(winFolder, extractDir)
+      removeDir(winFolder)
+
   # A "special" version is downloaded from GitHub and thus needs a `.git`
   # directory in order to let `koch` know that it should download a "devel"
   # Nimble.
@@ -241,4 +257,4 @@ when isMainModule:
     handleTelemetry(params)
     quit(QuitFailure)
 
-  handleTelemetry(params)
+  handleTelemetry(params)

src/choosenim/builder.nim

@@ -6,13 +6,16 @@ import nimblepkg/common as nimble_common
 import cliparams, download, utils, common, telemetry
 
 proc buildFromCSources() =
+  let arch = getGccArch()
   when defined(windows):
-    doCmdRaw("build.bat")
-    # TODO: How should we handle x86 vs amd64?
+    if arch == 32:
+      doCmdRaw("build.bat")
+    elif arch == 64:
+      doCmdRaw("build64.bat")
   else:
     doCmdRaw("sh build.sh")
 
-proc buildCompiler(params: CliParams) =
+proc buildCompiler(params: CliParams, version: Version) =
   ## Assumes that CWD contains the compiler (``build`` should have changed it).
   let binDir = getCurrentDir() / "bin"
   if fileExists(binDir / "nim".addFileExt(ExeExt)):
@@ -22,10 +25,7 @@ proc buildCompiler(params: CliParams) =
   if fileExists(getCurrentDir() / "build.sh"):
     buildFromCSources()
   else:
-    display("Warning:", "Building from latest C sources. They may not be " &
-                        "compatible with the Nim version you have chosen to " &
-                        "install.", Warning, HighPriority)
-    let path = downloadCSources(params)
+    let path = downloadCSources(params, version)
     let extractDir = getCurrentDir() / "csources"
     extract(path, extractDir)
 
@@ -77,18 +77,14 @@ proc build*(extractDir: string, version: Version, params: CliParams) =
 
   let currentDir = getCurrentDir()
   setCurrentDir(extractDir)
-  # Add MingW bin dir to PATH so that `build.bat` script can find gcc.
-  let pathEnv = getEnv("PATH")
-  putEnv("PATH", params.getMingwBin() & PathSep & pathEnv)
   defer:
     setCurrentDir(currentDir)
-    putEnv("PATH", pathEnv)
 
   display("Building", "Nim " & $version, priority = HighPriority)
 
   var success = false
   try:
-    buildCompiler(params)
+    buildCompiler(params, version)
     buildTools()
     success = true
   except NimbleError as exc:

src/choosenim/download.nim

@@ -10,7 +10,8 @@ const
   githubUrl = "https://github.com/nim-lang/Nim/archive/$1.tar.gz"
   websiteUrl = "http://nim-lang.org/download/nim-$1.tar" &
     getArchiveFormat()
-  csourcesUrl = "https://github.com/nim-lang/csources/archive/master.tar.gz"
+  csourcesUrl = "https://github.com/nim-lang/csources/archive/$1.tar.gz"
+  winBinaryZipUrl = "http://nim-lang.org/download/nim-$1_x$2.zip"
 
 const # Windows-only
   mingwUrl = "http://nim-lang.org/download/mingw32.tar.gz"
@@ -198,7 +199,21 @@ proc needsDownload(params: CliParams, downloadUrl: string,
             priority=HighPriority)
     return false
 
+proc downloadCheck(params: CliParams, url: string): string =
+  result = ""
+  if not needsDownload(params, url, result): return
+
+  downloadFile(url, result, params)
+
+proc downloadCheckRenamed(params: CliParams, url, filename: string): string =
+  # Special check since we have to rename to disambiguate
+  result = getDownloadDir(params) / filename
+  if not fileExists(result):
+    let origfile = downloadCheck(params, url)
+    moveFile(origfile, result)
+
 proc downloadImpl(version: Version, params: CliParams): string =
+  let arch = getGccArch()
   if version.isSpecial():
     let reference =
       case normalize($version)
@@ -208,21 +223,28 @@ proc downloadImpl(version: Version, params: CliParams): string =
         ($version)[1 .. ^1]
     display("Downloading", "Nim $1 from $2" % [reference, "GitHub"],
             priority = HighPriority)
-    let url = githubUrl % reference
-    var outputPath: string
-    if not needsDownload(params, url, outputPath): return outputPath
-
-    downloadFile(url, outputPath, params)
-    result = outputPath
+    result = downloadCheck(params, githubUrl % reference)
   else:
     display("Downloading", "Nim $1 from $2" % [$version, "nim-lang.org"],
             priority = HighPriority)
-    let url = websiteUrl % $version
-    var outputPath: string
-    if not needsDownload(params, url, outputPath): return outputPath
 
-    downloadFile(url, outputPath, params)
-    result = outputPath
+    # Check if binary build available
+    when defined(windows):
+      try:
+        result = downloadCheck(params, winBinaryZipUrl % [$version, $arch])
+        return
+      except HttpRequestError:
+        display("Info:", "Binary build unavailable, building from source",
+                priority = HighPriority)
+
+    # Check if source tar.gz posted on nim-lang.org
+    try:
+      result = downloadCheck(params, websiteUrl % $version)
+    except HttpRequestError:
+      # Fallback to downloading from Github
+      # Rename to nim-VERSION.tar.gz to disambiguate
+      result = downloadCheckRenamed(params, githubUrl % ("v" & $version),
+                                    "nim-$1.tar.gz" % $version)
 
 proc download*(version: Version, params: CliParams): string =
   ## Returns the path of the downloaded .tar.(gz|xz) file.
@@ -232,32 +254,26 @@ proc download*(version: Version, params: CliParams): string =
     raise newException(ChooseNimError, "Version $1 does not exist." %
                        $version)
 
-proc downloadCSources*(params: CliParams): string =
-  var outputPath: string
-  if not needsDownload(params, csourcesUrl, outputPath):
-    return outputPath
-
+proc downloadCSources*(params: CliParams, version: Version): string =
   display("Downloading", "Nim C sources from GitHub", priority = HighPriority)
-  downloadFile(csourcesUrl, outputPath, params)
-  return outputPath
+  try:
+    # Download csources tagged version from Github
+    # Rename to csources-VERSION.tar.gz to disambiguate
+    result = downloadCheckRenamed(params, csourcesUrl % ("v" & $version),
+                                  "csources-$1.tar.gz" % $version)
+  except HttpRequestError:
+    result = downloadCheck(params, csourcesUrl % "master")
+    display("Warning:", "Building from latest C sources. They may not be " &
+                        "compatible with the Nim version you have chosen to " &
+                        "install.", Warning, HighPriority)
 
 proc downloadMingw32*(params: CliParams): string =
-  var outputPath: string
-  if not needsDownload(params, mingwUrl, outputPath):
-    return outputPath
-
   display("Downloading", "C compiler (Mingw32)", priority = HighPriority)
-  downloadFile(mingwUrl, outputPath, params)
-  return outputPath
+  result = downloadCheck(params, mingwUrl)
 
 proc downloadDLLs*(params: CliParams): string =
-  var outputPath: string
-  if not needsDownload(params, dllsUrl, outputPath):
-    return outputPath
-
   display("Downloading", "DLLs (openssl, pcre, ...)", priority = HighPriority)
-  downloadFile(dllsUrl, outputPath, params)
-  return outputPath
+  result = downloadCheck(params, dllsUrl)
 
 proc retrieveUrl*(url: string): string =
   when defined(curl):

src/choosenim/utils.nim

@@ -20,12 +20,24 @@ proc doCmdRaw*(cmd: string) =
         "Execution failed with exit code $1\nCommand: $2\nOutput: $3" %
         [$exitCode, cmd, output])
 
+proc extractZip(path: string, extractDir: string) =
+  var cmd = "unzip -o $1 -d $2"
+  if defined(windows):
+      cmd = "powershell -nologo -noprofile -command \"& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::ExtractToDirectory('$1', '$2'); }\""
+
+  let (outp, errC) = execCmdEx(cmd % [path, extractDir])
+  if errC != 0:
+    raise newException(ChooseNimError, "Unable to extract ZIP. Error was $1" % outp)
+
 proc extract*(path: string, extractDir: string) =
   display("Extracting", path.extractFilename(), priority = HighPriority)
 
   let ext = path.splitFile().ext
   var newPath = path
   case ext
+  of ".zip":
+    extractZip(path, extractDir)
+    return
   of ".xz":
     # We need to decompress manually.
     let unxzPath = findExe("unxz")
@@ -51,6 +63,27 @@ proc extract*(path: string, extractDir: string) =
     raise newException(ChooseNimError, "Unable to extract. Error was '$1'." %
                        exc.msg)
 
+proc moveDirContents*(srcDir, dstDir: string) =
+  for kind, entry in walkDir(srcDir):
+    if kind in [pcFile, pcLinkToFile]:
+      moveFile(entry, dstDir/entry.extractFilename())
+    else:
+      moveDir(entry, dstDir/entry.extractFilename())
+
+proc getGccArch*(): int =
+  # gcc should be in PATH
+  var
+    outp = ""
+    errC = 0
+
+  when defined(windows):
+    (outp, errC) = execCmdEx("cmd /c echo int main^(^) { return sizeof^(void *^); } | gcc -xc - -o archtest && archtest")
+  else:
+    (outp, errC) = execCmdEx("sh echo \"int main() { return sizeof(void *); }\" | gcc -xc - -o archtest && archtest")
+
+  removeFile("archtest".addFileExt(ExeExt))
+  return errC * 8
+
 proc getProxy*(): Proxy =
   ## Returns ``nil`` if no proxy is specified.
   var url = ""

tests/tester.nim

@@ -140,6 +140,10 @@ test "can choose v0.16.0":
 
     check inLines(output.processOutput, "building")
     check inLines(output.processOutput, "downloading")
+    when defined(windows):
+      check inLines(output.processOutput, "already built")
+    else:
+      check inLines(output.processOutput, "building tools")
     check hasLine(output.processOutput, "switched to nim 0.16.0")
 
   block: