resolve Windows classpath regression in MainGenericRunner rather than dist/bin/scala

Author: philwalk

compiler/src/dotty/tools/MainGenericRunner.scala

@@ -105,7 +105,17 @@ object MainGenericRunner {
     case "-run" :: fqName :: tail =>
       process(tail, settings.withExecuteMode(ExecuteMode.Run).withTargetToRun(fqName))
     case ("-cp" | "-classpath" | "--class-path") :: cp :: tail =>
-      process(tail, settings.copy(classPath = settings.classPath.appended(cp)))
+      val (tailargs, cpstr) = if classpathSeparator != ';' || cp.contains(classpathSeparator) then
+        (tail, cp)
+      else
+        val globdir = cp.replace('\\', '/').replaceAll("/[^/]*$","")
+        val jarfiles = cp :: tail
+        val cpfiles = jarfiles.takeWhile( f => f.startsWith(globdir) && ((f.toLowerCase.endsWith(".jar") || f.endsWith(".zip"))) )
+        val tailargs = jarfiles.drop(cpfiles.size)
+        (tailargs, cpfiles.mkString(classpathSeparator))
+        
+      process(tailargs, settings.copy(classPath = settings.classPath.appended(cpstr)))
+
     case ("-version" | "--version") :: _ =>
       settings.copy(
         executeMode = ExecuteMode.Repl,
@@ -141,6 +151,13 @@ object MainGenericRunner {
         val newSettings = if arg.startsWith("-") then settings else settings.withPossibleEntryPaths(arg).withModeShouldBePossibleRun
         process(tail, newSettings.withResidualArgs(arg))
 
+  // collect globbed classpath entries
+  def collectGlobbedEntries(entries: List[String]): (List[String], List[String]) = {
+    val cpfiles = entries.takeWhile( f => (f.toLowerCase.endsWith(".jar") || f.endsWith(".zip")) )
+    val remainder = entries.drop(cpfiles.size)
+    (cpfiles, remainder)
+  }
+
   def main(args: Array[String]): Unit =
     val scalaOpts = envOrNone("SCALA_OPTS").toArray.flatMap(_.split(" "))
     val allArgs = scalaOpts ++ args
@@ -155,7 +172,7 @@ object MainGenericRunner {
         repl.Main.main(properArgs.toArray)
 
       case ExecuteMode.PossibleRun =>
-        val newClasspath = (settings.classPath :+ ".").map(File(_).toURI.toURL)
+        val newClasspath = (settings.classPath :+ ".").flatMap(_.split(classpathSeparator).filter(_.nonEmpty)).map(File(_).toURI.toURL)
         import dotty.tools.runner.RichClassLoader._
         val newClassLoader = ScalaClassLoader.fromURLsParallelCapable(newClasspath)
         val targetToRun = settings.possibleEntryPaths.to(LazyList).find { entryPath =>
@@ -177,8 +194,7 @@ object MainGenericRunner {
             cp.filterNot(c => compilerLibs.exists(c.contains))
           else
             cp
-        val newClasspath = (settings.classPath ++ removeCompiler(scalaClasspath) :+ ".").map(File(_).toURI.toURL)
-
+        val newClasspath = (settings.classPath.flatMap(_.split(classpathSeparator).filter(_.nonEmpty)) ++ removeCompiler(scalaClasspath) :+ ".").map(File(_).toURI.toURL)
         val res = ObjectRunner.runAndCatch(newClasspath, settings.targetToRun, settings.residualArgs).flatMap {
           case ex: ClassNotFoundException if ex.getMessage == settings.targetToRun =>
             val file = settings.targetToRun
@@ -192,7 +208,6 @@ object MainGenericRunner {
         errorFn("", res)
       case ExecuteMode.Script =>
         val targetScriptPath: String = settings.targetScript.toString.replace('\\', '/')
-        System.setProperty("script.path", targetScriptPath)
         val properArgs =
           List("-classpath", settings.classPath.mkString(classpathSeparator)).filter(Function.const(settings.classPath.nonEmpty))
             ++ settings.residualArgs

compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala

@@ -130,6 +130,7 @@ class CoursierScalaTests:
       val argsFile = new File(getClass.getResource("/run/myargs.txt").getPath)
       val output = CoursierScalaTests.csScalaCmd(s"@$argsFile", source.absPath)
       assertEquals(output.mkString("\n"), "Hello")
+    argumentFile()
 
 object CoursierScalaTests:
 

compiler/test/dotty/tools/scripting/ClasspathTests.scala

@@ -76,7 +76,9 @@ lazy val env:Map[String, String] = System.getenv.asScala.toMap
 // script output expected as "<tag>: <value>"
 def findTaggedLine(tag: String, lines: Seq[String]): String =
   lines.find { _.startsWith(tag) } match
-    case None => sys.error(s"no $tag: found in script output")
+    case None =>
+      lines.foreach { System.err.printf("line[%s]\n", _) }
+      sys.error(s"no $tag: found in script output")
     case Some(cwd) => cwd.dropWhile( _ != ' ').trim // discard tag
 
 def exec(cmd: String *): Seq[String] = Process(cmd).lazyLines_!.toList

dist/bin/scala

@@ -28,39 +28,10 @@ fi
 
 source "$PROG_HOME/bin/common"
 
-case `uname` in
-CYG*|MINGW*|MSYS*) PSEP=';' ;;
-*) PSEP=':' ;;
-esac
-
-ARGS=()
-while [ $# -gt 0 ]; do
-  case "$1" in
-  -cp | -classpath) # partial fix for #10761
-    # passed as two arguments, e.g. '-classpath' 'lib/*'
-    ARGS+=($1)
-    ARGS+=("$2${PSEP}")
-    shift
-    shift
-    ;;
-  -cp*|-classpath*) # partial fix for #10761
-    # passed as a single argument, e.g. '-classpath lib/*'
-    # (hashbang line can glom args together)
-    ARGS+=('-classpath')
-    ARGS+=("\"${1#* *}${PSEP}\"")
-    shift
-    ;;
-  *)
-    ARGS+=($1)
-    shift
-    ;;
-  esac
-done
-
 # exec here would prevent onExit from being called, leaving terminal in unusable state
 compilerJavaClasspathArgs
 [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
-eval "\"$JAVACMD\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${ARGS[@]}"
+eval "\"$JAVACMD\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "$@"
 scala_exit_status=$?