Move Scala Native linking to runtime fetched scala-native-cli

This way we can freely change the SN version on scala-cli runtime.
With this change logging was moved to the default scala native logger
with certain log levels being filtered out (on scala-native-cli side)
depending on verbosity.
Scala Native caching was also adjusted to facilitate incorrect options
being passed to scala-native-cli.

Author: jchyb

build.sc

@@ -174,7 +174,7 @@ class Build(val crossScalaVersion: String)
     Deps.dependency,
     Deps.guava, // for coursierJvm / scalaJsEnvNodeJs, see above
     Deps.nativeTestRunner,
-    Deps.nativeTools,
+    Deps.nativeTools, // Used only for discovery methods. For linking, look for scala-native-cli
     Deps.osLib,
     Deps.pprint,
     Deps.scalaJsEnvNodeJs,

modules/build/src/main/scala/scala/build/Logger.scala

@@ -19,7 +19,8 @@ trait Logger {
 
   def coursierLogger: coursier.cache.CacheLogger
   def bloopRifleLogger: BloopRifleLogger
-  def scalaNativeLogger: sn.Logger
+  def scalaNativeTestLogger: sn.Logger
+  def scalaNativeCliInternalLoggerOptions: List[String]
 
   def compilerOutputStream: PrintStream
 }
@@ -40,8 +41,12 @@ object Logger {
       coursier.cache.CacheLogger.nop
     def bloopRifleLogger: BloopRifleLogger =
       BloopRifleLogger.nop
-    def scalaNativeLogger: sn.Logger =
+    def scalaNativeTestLogger: sn.Logger =
       sn.Logger.nullLogger
+    def scalaNativeCliInternalLoggerOptions: List[String] = {
+      import scala.build.options.ScalaNativeOptions.Logger._
+      List(noError, noWarn, noInfo, noDebug)
+    }
 
     def compilerOutputStream: PrintStream =
       new PrintStream(

modules/build/src/main/scala/scala/build/errors/ScalaNativeBuildError.scala

@@ -0,0 +1,5 @@
+package scala.build.errors
+
+final class ScalaNativeBuildError(
+  caughtError: String
+) extends BuildException(s"Error compiling with Scala Native:\n${caughtError}")

modules/build/src/main/scala/scala/build/internal/NativeBuilderHelper.scala

@@ -4,10 +4,11 @@ import java.math.BigInteger
 import java.security.MessageDigest
 
 import scala.build.Build
-import scala.scalanative.{build => sn}
 
 object NativeBuilderHelper {
 
+  case class SNCacheData(val changed: Boolean, val projectSha: String)
+
   private def resolveProjectShaPath(nativeWorkDir: os.Path) = nativeWorkDir / ".project_sha"
   private def resolveOutputShaPath(nativeWorkDir: os.Path)  = nativeWorkDir / ".output_sha"
 
@@ -20,10 +21,10 @@ object NativeBuilderHelper {
     String.format(s"%040x", calculatedSum)
   }
 
-  private def projectSha(build: Build.Successful, nativeConfig: sn.NativeConfig) = {
+  private def projectSha(build: Build.Successful, config: List[String]) = {
     val md = MessageDigest.getInstance("SHA-1")
     md.update(build.inputs.sourceHash().getBytes)
-    md.update(nativeConfig.toString.getBytes)
+    md.update(config.toString.getBytes)
     md.update(Constants.version.getBytes)
     md.update(build.options.hash.getOrElse("").getBytes)
 
@@ -32,22 +33,29 @@ object NativeBuilderHelper {
     String.format(s"%040x", calculatedSum)
   }
 
-  def updateOutputSha(dest: os.Path, nativeWorkDir: os.Path) = {
+  def updateProjectAndOutputSha(
+    dest: os.Path,
+    nativeWorkDir: os.Path,
+    currentProjectSha: String
+  ) = {
+    val projectShaPath = resolveProjectShaPath(nativeWorkDir)
+    os.write.over(projectShaPath, currentProjectSha, createFolders = true)
+
     val outputShaPath = resolveOutputShaPath(nativeWorkDir)
     val sha           = fileSha(dest)
     os.write.over(outputShaPath, sha)
   }
 
-  def shouldBuildIfChanged(
+  def getCacheData(
     build: Build.Successful,
-    nativeConfig: sn.NativeConfig,
+    config: List[String],
     dest: os.Path,
     nativeWorkDir: os.Path
-  ): Boolean = {
+  ): SNCacheData = {
     val projectShaPath = resolveProjectShaPath(nativeWorkDir)
     val outputShaPath  = resolveOutputShaPath(nativeWorkDir)
 
-    val currentProjectSha = projectSha(build, nativeConfig)
+    val currentProjectSha = projectSha(build, config)
     val currentOutputSha  = if (os.exists(dest)) Some(fileSha(dest)) else None
 
     val previousProjectSha = if (os.exists(projectShaPath)) Some(os.read(projectShaPath)) else None
@@ -58,9 +66,6 @@ object NativeBuilderHelper {
       previousOutputSha != currentOutputSha ||
       !os.exists(dest)
 
-    // update sha in .projectShaPath
-    if (changed) os.write.over(projectShaPath, currentProjectSha, createFolders = true)
-
-    changed
+    SNCacheData(changed, currentProjectSha)
   }
 }

modules/build/src/main/scala/scala/build/internal/Runner.scala

@@ -306,7 +306,7 @@ object Runner {
     val config = TestAdapter.Config()
       .withBinaryFile(launcher)
       .withEnvVars(sys.env.toMap)
-      .withLogger(logger.scalaNativeLogger)
+      .withLogger(logger.scalaNativeTestLogger)
 
     var adapter: TestAdapter = null
 

modules/build/src/main/scala/scala/build/options/ScalaNativeOptions.scala

@@ -27,28 +27,45 @@ final case class ScalaNativeOptions(
 
   private def gc(): sn.GC =
     gcStr.map(_.trim).filter(_.nonEmpty) match {
-      case Some("default") | None => sn.GC.default
+      case Some("default") | None => sn.Discover.GC()
       case Some(other)            => sn.GC(other)
     }
+  private def gcCliOption(): List[String] =
+    List("--gc", gc().name)
+
   private def mode(): sn.Mode =
     modeStr.map(_.trim).filter(_.nonEmpty) match {
       case Some("default") | None => sn.Discover.mode()
       case Some(other)            => sn.Mode(other)
     }
+  private def modeCliOption(): List[String] =
+    List("--release-mode", mode().name)
 
   private def clangPath() = clang
     .filter(_.nonEmpty)
     .map(Paths.get(_))
     .getOrElse(sn.Discover.clang())
+  private def clangCliOption(): List[String] = Nil
+//    List("--clang", clangPath.toString())
+
   private def clangppPath() = clangpp
     .filter(_.nonEmpty)
     .map(Paths.get(_))
     .getOrElse(sn.Discover.clangpp())
-  private def finalLinkingOptions() =
+  private def clangppCliOption(): List[String] = Nil
+//    List("--clang-pp", clangppPath().toString())
+
+  private def finalLinkingOptions(): List[String] =
     linkingOptions ++ (if (linkingDefaults.getOrElse(true)) sn.Discover.linkingOptions() else Nil)
-  private def finalCompileOptions() =
+  private def finalCompileOptions(): List[String] =
     compileOptions ++ (if (compileDefaults.getOrElse(true)) sn.Discover.compileOptions() else Nil)
 
+  private def linkingCliOptions(): List[String] = Nil
+   finalLinkingOptions.flatMap(option => List("--linking-option", option))
+
+  private def compileCliOptions(): List[String] = Nil
+   finalCompileOptions.flatMap(option => List("--compile-option", option))
+
   def platformSuffix: String =
     "native" + ScalaVersion.nativeBinary(finalVersion).getOrElse(finalVersion)
   def nativeDependencies: Seq[AnyDependency] =
@@ -62,12 +79,13 @@ final case class ScalaNativeOptions(
       version = finalVersion,
       // there are more modes than bloop allows, but that setting here shouldn't end up being used anyway
       mode =
-        if (mode().name == "release") BloopConfig.LinkerMode.Release
+        if (mode() == sn.Mode.releaseFast || mode() == sn.Mode.releaseFull)
+          BloopConfig.LinkerMode.Release
         else BloopConfig.LinkerMode.Debug,
       gc = gc().name,
       targetTriple = None,
-      clang = clangPath(),
-      clangpp = clangppPath(),
+      clang = Paths.get("."),
+      clangpp = Paths.get("."),
       toolchain = Nil,
       options = BloopConfig.NativeOptions(
         linker = finalLinkingOptions(),
@@ -79,19 +97,24 @@ final case class ScalaNativeOptions(
       output = None
     )
 
-  def config(): sn.NativeConfig =
-    sn.NativeConfig.empty
-      .withGC(gc())
-      .withMode(mode())
-      .withLinkStubs(false)
-      .withClang(clangPath())
-      .withClangPP(clangppPath())
-      .withLinkingOptions(linkingOptions)
-      .withCompileOptions(compileOptions)
+  def configCliOptions(): List[String] =
+    gcCliOption()
+      .++(modeCliOption())
+      .++(clangCliOption())
+      .++(clangppCliOption())
+      .++(linkingCliOptions())
+      .++(compileCliOptions())
 
 }
 
 object ScalaNativeOptions {
   implicit val hasHashData: HasHashData[ScalaNativeOptions] = HasHashData.derive
   implicit val monoid: ConfigMonoid[ScalaNativeOptions]     = ConfigMonoid.derive
+
+  object Logger {
+    val noError = "--disable-error"
+    val noWarn  = "--disable-warn"
+    val noInfo  = "--disable-info"
+    val noDebug = "--disable-debug"
+  }
 }