pruned unused code

Author: philwalk

modules/core/src/main/scala/scala/build/internals/NativeWrapper.scala

@@ -34,7 +34,7 @@ object MsvcEnvironment {
         logger.debug(s"Using vcvars script $vcvars")
 
         val msvcEnv = captureVcvarsEnv(vcvars, workingDir)
-        val clDir = os.Path(msvcEnv("VCTOOLSINSTALLDIR")) / "bin" / "Hostx64" / "x64"
+        val clDir   = os.Path(msvcEnv("VCTOOLSINSTALLDIR")) / "bin" / "Hostx64" / "x64"
         logger.debug(s"clDir[$clDir]")
         if (!os.exists(clDir)) {
           logger.message(s"cl.exe directory missing: $clDir")
@@ -44,34 +44,28 @@ object MsvcEnvironment {
           val msvcEnv: Map[String, String] = captureVcvarsEnv(vcvars, workingDir)
           val clExe: os.Path               = clDir / "cl.exe"
           if !os.exists(clExe) then
-            logger.error(s"not found: $clExe")
+            logger.message(s"warning: file not found: $clExe")
 
           val msvcEntries: Seq[String] = {
             val entries = msvcEnv.getOrElse("PATH", "").split(";").toSeq
             if entries.headOption == Some(clDir.toString) then entries
             else clDir.toString +: entries
           }
 
-          def logMergedEntries(): Unit = {
-            logger.debug(s"msvc PATH entries:")
-            msvcEntries.foreach { entry =>
-              logger.debug(s"$entry;")
-            }
-          }
-          
           // show aliased drive map
           val substMap: Map[Char, String] = aliasedDriveLetters
           substMap.foreach((k, v) => logger.message(s"substMap  $k: -> $v"))
 
-          val mergedPath = msvcEntries.mkString(";")
-          val mergedEnv  =
-            minimalBaseEnv ++
-              msvcEnv +
-              ("PATH"                                 -> mergedPath) +
+          val finalPath = msvcEntries.mkString(";")
+          val finalEnv  =
+            msvcEnv +
+              ("PATH"                                 -> finalPath) +
               ("GRAALVM_ARGUMENT_VECTOR_PROGRAM_NAME" -> "native-image")
 
-          logger.debug(s"Launching native-image.exe with args: $command")
-          logMergedEntries()
+          logger.message(s"msvc PATH entries:")
+          msvcEntries.foreach { entry =>
+            logger.message(s"$entry;")
+          }
 
           // Replace native-image.cmd with native-image.exe, if applicable
           val updatedCommand: Seq[String] =
@@ -89,11 +83,13 @@ object MsvcEnvironment {
                 command
             }
 
+          logger.message(s"native-image w/args: $updatedCommand")
+
           val result =
             os.proc(updatedCommand)
               .call(
                 cwd = workingDir,
-                env = mergedEnv,
+                env = finalEnv,
                 stdout = os.Inherit,
                 stderr = os.Inherit
               )
@@ -228,9 +224,6 @@ object MsvcEnvironment {
     candidates.find(os.exists)
   }
 
-  private def minimalBaseEnv: Map[String, String] =
-    sys.env.filter { case (k, _) => windowsCoreEnvKeys.contains(k) }
-
   private def vcvarsOpt: Option[os.Path] = {
     val candidates =
       vcVarsCandidates
@@ -247,33 +240,6 @@ object MsvcEnvironment {
     }
   }
 
-  def isAbs(p: String): Boolean =
-    try os.Path(p).root.nonEmpty
-    catch case _: Throwable => false
-
-  def canonicalKey(p: String, cwd: os.Path): String =
-    try
-      val resolved = cwd.toNIO.resolve(p).normalize()
-      resolved.toRealPath().toString
-        .replace('\\', '/')
-        .stripSuffix("/")
-        .toLowerCase
-    catch
-      case _: Throwable =>
-        p.replace('\\', '/').stripSuffix("/").toLowerCase
-
-  def dedupePaths(entries: Seq[String], cwd: os.Path): Seq[String] =
-    val seen = scala.collection.mutable.HashSet[String]()
-    val out  = scala.collection.mutable.ArrayBuffer[String]()
-    for p <- entries.map(_.trim).filter(_.nonEmpty) do
-      val key = canonicalKey(p, cwd)
-      if !seen.contains(key) then
-        seen += key
-        out += p // preserve original form
-    out.toSeq
-
-  
-
   // newest VS first, Enterprise > Community > BuildTools
   private def vcVersions                              = Seq("2022", "2019", "2017")
   private def vcEditions                              = Seq("Enterprise", "Community", "BuildTools")
@@ -289,16 +255,6 @@ object MsvcEnvironment {
       }
     }
 
-  private lazy val windowsCoreEnvKeys = Set(
-    "SystemRoot",
-    "ComSpec",
-    "PATHEXT",
-    "TEMP",
-    "TMP",
-    "NUMBER_OF_PROCESSORS",
-    "PROCESSOR_ARCHITECTURE"
-  )
-
   lazy val mountedDrives: String = {
     val str         = "HKEY_LOCAL_MACHINE/SYSTEM/MountedDevices".replace('/', '\\')
     val queryDrives = s"reg query $str"
@@ -313,13 +269,4 @@ object MsvcEnvironment {
 
   lazy val systemRoot: String = sys.env.getOrElse("SystemRoot", "C:\\Windows").stripSuffix("\\")
   lazy val cmdExe: String     = s"$systemRoot\\System32\\cmd.exe"
-
-  lazy val windowsCorePathEntries: Seq[String] =
-    Seq(
-      s"$systemRoot\\System32",
-      s"$systemRoot",
-      s"$systemRoot\\System32\\Wbem",
-      s"$systemRoot\\System32\\WindowsPowerShell\\v1.0",
-      s"$systemRoot\\System32\\OpenSSH"
-    )
 }