leverage dotty.tools.io.ClassPath.expandPath ; allow windows */

Author: philwalk

compiler/src/dotty/tools/io/ClassPath.scala

@@ -132,7 +132,7 @@ object ClassPath {
       dir.list.filter(x => filt(x.name) && (x.isDirectory || isJarOrZip(x))).map(_.path).toList
 
     if (pattern == "*") lsDir(Directory("."))
-    else if (pattern.endsWith(wildSuffix)) lsDir(Directory(pattern dropRight 2))
+    else if (pattern.endsWith(wildSuffix) || pattern.endsWith("/*")) lsDir(Directory(pattern dropRight 2))
     else if (pattern.contains('*')) {
       try {
         val regexp = ("^" + pattern.replace("""\*""", """.*""") + "$").r

compiler/src/dotty/tools/scripting/ScriptingDriver.scala

@@ -10,7 +10,7 @@ import scala.jdk.CollectionConverters._
 import dotty.tools.dotc.{ Driver, Compiler }
 import dotty.tools.dotc.core.Contexts, Contexts.{ Context, ContextBase, ctx }
 import dotty.tools.dotc.config.CompilerCommand
-import dotty.tools.io.{ PlainDirectory, Directory }
+import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
 import dotty.tools.dotc.reporting.Reporter
 import dotty.tools.dotc.config.Settings.Setting._
 
@@ -29,17 +29,7 @@ class ScriptingDriver(compilerArgs: Array[String], scriptFile: File, scriptArgs:
 
         try
           val classpath = s"${ctx.settings.classpath.value}${pathsep}${sys.props("java.class.path")}"
-          val classpathEntries: Seq[Path] =
-            classpath.split(pathsep).toIndexedSeq.flatMap { entry =>
-              val f = Paths.get(entry).toAbsolutePath.normalize.toFile
-              // expand wildcard classpath entries
-              if (f.getName == "*" && f.getParentFile.isDirectory){
-                f.getParentFile.listFiles.filter { _.getName.toLowerCase.endsWith(".jar") }.map { _.toPath }.toSeq
-              } else {
-                Seq(f.toPath)
-              }
-            }.toIndexedSeq
-
+          val classpathEntries: Seq[Path] = ClassPath.expandPath(classpath, expandStar=true).map { Paths.get(_) }
           val (mainClass, mainMethod) = detectMainClassAndMethod(outDir, classpathEntries, scriptFile)
           val invokeMain: Boolean =
             Option(pack) match

compiler/test/dotty/tools/io/ClasspathTest.scala

@@ -0,0 +1,48 @@
+package dotty.tools.io
+
+import org.junit.Test
+
+import java.io.File
+import dotty.tools.io.AbstractFile
+import java.nio.file.{Files, Paths}
+import java.nio.file.StandardCopyOption._
+import java.nio.file.attribute.PosixFilePermissions
+import dotty.tools.io.{ PlainDirectory, Directory, ClassPath }
+
+class ClasspathTest {
+
+  def pathsep = sys.props("path.separator")
+
+  //
+  // Cope with wildcard classpath entries, exercised with -classpath <cp>
+  //
+  // Verify that Windows users not forced to use backslash in classpath.
+  //
+  @Test def testWildcards(): Unit =
+    import dotty.tools.io.ClassPath
+    val outDir = Files.createTempDirectory("classpath-test")
+    try
+      val compilerLib = "dist/target/pack/lib"
+      for src <- Paths.get(compilerLib).toFile.listFiles.toList.take(5) do
+        val dest = Paths.get(s"$outDir/${src.getName}")
+        printf("copy: %s\n",Files.copy(src.toPath,dest)) // ,REPLACE_EXISTING,COPY_ATTRIBUTES))
+
+      //outDir.toFile.listFiles.toList.foreach { printf("%s\n",_) }
+      val cp = Seq(s"$compilerLib/*",s"$outDir/*","not-a-real-directory/*").mkString(pathsep).replace('\\','/')
+     
+      // need to expand wildcard classpath entries
+      val entries = ClassPath.expandPath(cp)
+      for entry <- entries.take(10) do
+        println(entry)
+
+    finally
+      deleteFile(outDir.toFile)
+
+
+  private def deleteFile(target: File): Unit =
+    if target.isDirectory then
+      for member <- target.listFiles.toList
+      do deleteFile(member)
+    target.delete()
+  end deleteFile
+}