review tweaks

Author: romanowski

build.sc

@@ -12,6 +12,7 @@ import $file.project.settings, settings.{
   PublishLocalNoFluff,
   ScalaCliCrossSbtModule,
   ScalaCliScalafixModule,
+  ScalaCliCompile,
   localRepoResourcePath,
   platformExecutableJarExtension,
   workspaceDirName
@@ -418,22 +419,14 @@ class Options(val crossScalaVersion: String) extends BuildLikeModule {
   }
 }
 
-trait ScalaParse extends SbtModule with ScalaCliPublishModule with settings.ScalaCliCompile {
+trait ScalaParse extends SbtModule with ScalaCliPublishModule with ScalaCliCompile {
   def ivyDeps      = super.ivyDeps() ++ Agg(Deps.scalaparse)
   def scalaVersion = Scala.defaultInternal
 }
 
-trait Scala3Runtime extends SbtModule with ScalaCliPublishModule with settings.ScalaCliCompile {
-  def ivyDeps      = super.ivyDeps() ++ Agg(Deps.scalaparse)
+trait Scala3Runtime extends SbtModule with ScalaCliPublishModule with ScalaCliCompile {
+  def ivyDeps      = super.ivyDeps()
   def scalaVersion = Scala.scala3
-  def jar = T {
-    val original = super.jar().path
-    // scala3RuntimeFixes.jar is also used within
-    // resource-config.json and BytecodeProcessor.scala
-    val dest = original / os.up / "scala3RuntimeFixes.jar"
-    os.copy(original, dest)
-    PathRef(dest)
-  }
 }
 
 class Scala3Graal(val crossScalaVersion: String) extends BuildLikeModule {
@@ -443,15 +436,21 @@ class Scala3Graal(val crossScalaVersion: String) extends BuildLikeModule {
   )
 
   def resources = T.sources {
-    super.resources() ++ Seq(`scala3-runtime`.jar())
+    val extraResourceDir = T.dest / "extra"
+    // scala3RuntimeFixes.jar is also used within
+    // resource-config.json and BytecodeProcessor.scala
+    os.copy.over(
+      `scala3-runtime`.jar().path,
+      extraResourceDir / "scala3RuntimeFixes.jar",
+      createFolders = true
+    )
+    super.resources() ++ Seq(mill.PathRef(extraResourceDir))
   }
 }
 
 trait Scala3GraalProcessor extends ScalaModule {
-  def moduleDeps   = Seq(`scala3-graal`(Scala.scala3))
-  def scalaVersion = Scala.scala3
-  // Make sure that we put jar on run classpath
-  def runClasspath   = T(`scala3-graal`(Scala.scala3).jar() +: super.runClasspath())
+  def moduleDeps     = Seq(`scala3-graal`(Scala.scala3))
+  def scalaVersion   = Scala.scala3
   def finalMainClass = "scala.cli.graal.CoursierCacheProcessor"
 }
 
@@ -519,7 +518,7 @@ class Build(val crossScalaVersion: String) extends BuildLikeModule {
   }
 }
 
-trait CliOptions extends SbtModule with ScalaCliPublishModule with settings.ScalaCliCompile {
+trait CliOptions extends SbtModule with ScalaCliPublishModule with ScalaCliCompile {
   def ivyDeps = super.ivyDeps() ++ Agg(
     Deps.caseApp,
     Deps.jsoniterCore,
@@ -553,9 +552,6 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
     `scala3-graal`(myScalaVersion)
   )
 
-  // We are adding graal as compile deps and adding jat on classpath since we want to build a native image from jar not from directories
-  def runClasspath = T(Seq(`scala3-graal`(myScalaVersion).jar()) ++ super.runClasspath())
-
   def repositories = super.repositories ++ customRepositories
 
   def ivyDeps = super.ivyDeps() ++ Agg(
@@ -587,8 +583,6 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
 trait Cli3 extends Cli {
   override def myScalaVersion = Scala.scala3
 
-  val argsFile = os.pwd / os.RelPath("out") / ".graal-cp-args"
-
   override def nativeImageClassPath = T {
     // TODO - results are cached - need to add inputs or caching method
     val classpath     = super.nativeImageClassPath().map(_.path).mkString(File.pathSeparator)

modules/cli/src/main/scala/scala/cli/packaging/NativeImage.scala

@@ -234,15 +234,15 @@ object NativeImage {
         maybeWithManifestClassPath(
           createManifest = Properties.isWin,
           classPath = originalClasspath.map(os.Path(_, os.pwd))
-        ) { processedClasspath =>
+        ) { processedClassPath =>
           val (classPath, toClean, scala3extraOptions) =
             if (!build.scalaParams.scalaBinaryVersion.startsWith("3"))
-              (processedClasspath, Seq[os.Path](), Seq[String]())
+              (processedClassPath, Seq[os.Path](), Seq[String]())
             else {
               val coursierCacheLocation = os.Path(FileCache().location.toPath())
               val cache                 = CoursierCache(coursierCacheLocation)
-              val cpString              = processedClasspath.mkString(File.pathSeparator)
-              val processed             = BytecodeProcessor.processClasspath(cpString, cache).toSeq
+              val cpString              = processedClassPath.mkString(File.pathSeparator)
+              val processed             = BytecodeProcessor.processClassPath(cpString, cache).toSeq
               val nativeConfigFile      = os.temp(suffix = ".json")
               os.write.over(
                 nativeConfigFile,

modules/scala3-graal/src/main/scala/scala/cli/graal/BytecodeProcessor.scala

@@ -52,14 +52,14 @@ object BytecodeProcessor {
   }
 
   def processPathingJar(pathingJar: String, cache: JarCache): Seq[ClassPathEntry] = {
-    val originalJar = toPath(pathingJar)
+    val originalJar = os.Path(pathingJar, os.pwd)
     val jarFile     = new JarFile(originalJar.toIO)
     try {
       val cp = jarFile.getManifest().getMainAttributes().getValue(Attributes.Name.CLASS_PATH)
       if (cp != null && cp.nonEmpty) {
         // paths in pathing jars are spectated by spaces
         val entries     = cp.split(" +").toSeq
-        val processedCp = processClasspathEntries(entries, cache)
+        val processedCp = processClassPathEntries(entries, cache)
         val dest        = os.temp(suffix = ".jar")
         val outStream   = Files.newOutputStream(dest.toNIO, StandardOpenOption.CREATE)
         try {
@@ -73,22 +73,22 @@ object BytecodeProcessor {
         }
         finally outStream.close()
       }
-      else processClasspathEntries(Seq(pathingJar), cache)
+      else processClassPathEntries(Seq(pathingJar), cache)
     }
     finally jarFile.close()
   }
 
-  def processClasspath(classpath: String, cache: JarCache = TempCache): Seq[ClassPathEntry] = {
-    val cp = classpath.split(File.pathSeparator)
-    if (cp.size == 1 && cp.head.endsWith(".jar"))
-      processPathingJar(cp.head, cache)
-    else
-      processClasspathEntries(cp.toSeq, cache)
-  }
+  def processClassPath(classPath: String, cache: JarCache = TempCache): Seq[ClassPathEntry] =
+    classPath.split(File.pathSeparator) match {
+      case Array(maybePathingJar) if maybePathingJar.endsWith(".jar") =>
+        processPathingJar(maybePathingJar, cache)
+      case cp =>
+        processClassPathEntries(cp.toSeq, cache)
+    }
 
-  def processClasspathEntries(entries: Seq[String], cache: JarCache): Seq[ClassPathEntry] = {
+  def processClassPathEntries(entries: Seq[String], cache: JarCache): Seq[ClassPathEntry] = {
     val cp = entries.map { str =>
-      val path = toPath(str)
+      val path = os.Path(str, os.pwd)
       cache.cache(path) { dest =>
         if (path.ext == "jar" && os.isFile(path)) processJar(path, dest, cache)
         else if (os.isDir(path)) processDir(path, dest, cache)
@@ -244,10 +244,4 @@ object BytecodeProcessor {
       else
         super.visitMethod(access, name, desc, sig, exceptions)
   }
-
-  def toPath(str: String) = os.FilePath(str) match {
-    case p: os.Path    => p
-    case r: os.RelPath => os.pwd / r
-    case s: os.SubPath => os.pwd / s
-  }
 }

project/settings.sc

@@ -198,7 +198,6 @@ trait CliLaunchers extends SbtModule { self =>
         else staticLibDir().path.toString
       Seq(
         s"-H:IncludeResources=$localRepoResourcePath",
-        "-H:IncludeResources='.*scala3RuntimeFixes.jar$'",
         "-H:-ParseRuntimeOptions",
         s"-H:CLibraryPath=$cLibPath"
       )