increase graalvm-native-image exception logging; native-image.cmd instead of .exe

Author: philwalk

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

@@ -67,26 +67,12 @@ object MsvcEnvironment {
             logger.message(s"$entry;")
           }
 
-          // Replace native-image.cmd with native-image.exe, if applicable
-          val updatedCommand: Seq[String] =
-            command.headOption match {
-              case Some(cmd) if cmd.toLowerCase.endsWith("native-image.cmd") =>
-                val cmdPath   = os.Path(cmd, os.pwd)
-                val graalHome = cmdPath / os.up / os.up
-                resolveNativeImage(graalHome) match {
-                  case Some(exe) =>
-                    exe.toString +: command.tail
-                  case None =>
-                    command // fall back to the .cmd wrapper
-                }
-              case _ =>
-                command
-            }
-
-          logger.message(s"native-image w/args: $updatedCommand")
-
-          val result =
-            os.proc(updatedCommand)
+          logger.message(s"native-image w/args: $command")
+
+          // request extra info in case of exceptions
+          val altCommand = insertAfterCp(command, "-H:+ReportExceptionStackTraces")
+          val result     =
+            os.proc(altCommand)
               .call(
                 cwd = workingDir,
                 env = finalEnv,
@@ -99,6 +85,16 @@ object MsvcEnvironment {
     }
   }
 
+  def insertAfterCp(cmd: Seq[String], flag: String): Seq[String] =
+    cmd match {
+      case exe +: "-cp" +: cp +: rest =>
+        exe +: "-cp" +: cp +: flag +: rest
+      case exe +: rest =>
+        exe +: flag +: rest
+      case Seq() =>
+        Seq()
+    }
+
   def aliasedDriveLetters: Map[Char, String] =
     try
       val (exitCode, output) = execWindowsCmd(cmdExe, "/c", "subst")
@@ -215,15 +211,6 @@ object MsvcEnvironment {
         .toMap
   }
 
-  private def resolveNativeImage(graalHome: os.Path): Option[os.Path] = {
-    val candidates = Seq(
-      graalHome / "lib" / "svm" / "bin" / "native-image.exe",
-      graalHome / "bin" / "native-image.exe",
-      graalHome / "native-image.exe"
-    )
-    candidates.find(os.exists)
-  }
-
   private def vcvarsOpt: Option[os.Path] = {
     val candidates =
       vcVarsCandidates