Add native launchers, Restore CI tests on Windows

Author: bishabosha

.github/workflows/ci.yaml

@@ -230,7 +230,7 @@ jobs:
         shell: cmd
 
       - name: build binary
-        run: sbt "dist/pack" & bash -version
+        run: sbt "dist-win-x64/pack" & bash -version
         shell: cmd
 
       - name: cygwin tests
@@ -270,7 +270,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Test
-        run: sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";dist-win-x64/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test

bin/scala

@@ -2,4 +2,37 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scala" "--power" "$@" "--offline" "--server=false"
+scala_args() {
+
+  declare -a CLI_ARGS
+  declare -a SCRIPT_ARGS
+  declare DISABLE_BLOOP=1
+
+  while (( "$#" )); do
+    case "$1" in
+      "--")
+        shift
+        SCRIPT_ARGS+=("--")
+        SCRIPT_ARGS+=("$@")
+        break
+        ;;
+      "clean")
+        CLI_ARGS+=("$1")
+        DISABLE_BLOOP=0 # clean command should not add --offline --server=false
+        shift
+        ;;
+      *)
+        CLI_ARGS+=("$1")
+        shift
+        ;;
+    esac
+  done
+
+  if [ $DISABLE_BLOOP -eq 1 ]; then
+    CLI_ARGS+=("--offline" "--server=false")
+  fi
+
+  echo "--power ${CLI_ARGS[@]} ${SCRIPT_ARGS[@]}"
+}
+
+"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scala" $(scala_args "$@")

build.sbt

@@ -28,6 +28,11 @@ val `scaladoc-js-main` = Build.`scaladoc-js-main`
 val `scaladoc-js-contributors` = Build.`scaladoc-js-contributors`
 val `scala3-bench-run` = Build.`scala3-bench-run`
 val dist = Build.dist
+val `dist-mac-x64` = Build.`dist-mac-x64`
+val `dist-mac-aarch64` = Build.`dist-mac-aarch64`
+val `dist-win-x64` = Build.`dist-win-x64`
+val `dist-linux-x64` = Build.`dist-linux-x64`
+val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
 val `community-build` = Build.`community-build`
 val `sbt-community-build` = Build.`sbt-community-build`
 val `scala3-presentation-compiler` = Build.`scala3-presentation-compiler`

compiler/test-resources/scripting/argfileClasspath.sc

@@ -1,5 +1,5 @@
 #!/usr/bin/env bin/scala
-
+// This file is a Scala CLI script.
 import java.nio.file.Paths
 
 // def main(args: Array[String]): Unit = // MIGRATION: Scala CLI expects `*.sc` files to be straight-line code

compiler/test-resources/scripting/classpathReport.sc renamed to compiler/test-resources/scripting/classpathReport_scalacli.sc

@@ -1,2 +1,4 @@
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
+
 def main(args: Array[String]): Unit =
   println("Hello " + util.Properties.propOrNull("key"))

compiler/test-resources/scripting/cpArgumentsFile.txt

@@ -0,0 +1,3 @@
+// This file is a Scala CLI script.
+
+println("Hello " + util.Properties.propOrNull("key"))

compiler/test-resources/scripting/envtest.sc

@@ -1,4 +1,4 @@
-#!/usr/bin/env scala
+#!/usr/bin/env fake-program-to-test-hashbang-removal
 # comment
 STUFF=nada
 !#

compiler/test-resources/scripting/envtestNu.sc

@@ -1,8 +1,8 @@
-#!/usr/bin/env scala
+#!/usr/bin/env fake-program-to-test-hashbang-removal
 # comment
 STUFF=nada
 !#
-
+// everything above this point should be ignored by the compiler
 def main(args: Array[String]): Unit =
   System.err.printf("mainClassFromStack: %s\n",mainFromStack)
   assert(mainFromStack.contains("hashBang"),s"fromStack[$mainFromStack]")

compiler/test-resources/scripting/envtest_scalacli.sc

@@ -1,4 +1,4 @@
-#!/usr/bin/env scala
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
 
   def main(args: Array[String]): Unit =
     val name = Option(sys.props("script.name")) match {

compiler/test-resources/scripting/hashBang.sc

@@ -1,4 +1,4 @@
-#!dist/target/pack/bin/scala
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
 
   def main(args: Array[String]): Unit =
     args.zipWithIndex.foreach { case (arg,i) => printf("arg %d: [%s]\n",i,arg) }

compiler/test-resources/scripting/hashBang.scala

@@ -4,7 +4,7 @@
 
 args.zipWithIndex.foreach { case (arg,i) => printf("arg %d: [%s]\n",i,arg) }
 
-if !scriptPath.endsWith("scriptPathNu.sc") then
+if !scriptPath.endsWith("scriptPath_scalacli.sc") then
   printf( s"incorrect script.path defined as [$scriptPath]")
 else
   printf("scriptPath: %s\n", scriptPath) // report the value

compiler/test-resources/scripting/scriptName.scala

@@ -1,4 +1,4 @@
-#!/usr/bin/env bin/scala
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
 
 // precise output format expected by BashScriptsTests.scala
 def main(args: Array[String]): Unit =

compiler/test-resources/scripting/scriptPath.sc

@@ -1,6 +1,7 @@
 #!/usr/bin/env bin/scala
 
+// This file is a Scala CLI script.
+
 // precise output format expected by BashScriptsTests.scala
-// MIGRATION: Scala CLI expects `*.sc` files to be straight-line code
 for (a,i) <- args.zipWithIndex do
   printf(s"arg %2d:[%s]\n",i,a)

compiler/test-resources/scripting/scriptPathNu.sc renamed to compiler/test-resources/scripting/scriptPath_scalacli.sc

@@ -1,4 +1,4 @@
-#!/usr/bin/env bin/scala
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
 
 def main(args: Array[String]): Unit = {
   println(new java.sql.Date(100L))

compiler/test-resources/scripting/showArgs.sc

@@ -0,0 +1,6 @@
+#!/usr/bin/env bin/scala
+
+// This file is a Scala CLI script.
+
+println(new java.sql.Date(100L))
+System.err.println("SCALA_OPTS="+Option(System.getenv("SCALA_OPTS")).getOrElse(""))

compiler/test-resources/scripting/showArgsNu.sc renamed to compiler/test-resources/scripting/showArgs_scalacli.sc

@@ -1,4 +1,4 @@
-#!/usr/bin/env scala
+// this file is intended to be ran as an argument to the dotty.tools.scripting.ScriptingDriver class
 
 import java.io.File
 

compiler/test-resources/scripting/sqlDateError.sc

@@ -0,0 +1,9 @@
+// This file is a Scala CLI script.
+
+import dotty.tools.tasty.TastyFormat
+//     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+//     not visible on default classpath, "compiler/test/dotty/tools/scripting/ClasspathTests.scala"
+//     adds it to classpath via a compiler argument `-classpath 'org/scala-lang/tasty-core_3/$VERSION/*'`
+
+val cp = sys.props("java.class.path")
+printf("unglobbed classpath: %s\n", cp)

compiler/test-resources/scripting/sqlDateErrorNu.sc

@@ -15,6 +15,8 @@ class ClasspathTest {
 
   def pathsep = sys.props("path.separator")
 
+  def isWindows: Boolean = scala.util.Properties.isWin
+
   //
   // Cope with wildcard classpath entries, exercised with -classpath <cp>
   //
@@ -23,7 +25,7 @@ class ClasspathTest {
   @Test def testWildcards(): Unit =
     val outDir = Files.createTempDirectory("classpath-test")
     try
-      val compilerLib = "dist/target/pack/lib"
+      val compilerLib = s"${if isWindows then "dist-win-x64" else "dist"}/target/pack/lib"
       val libdir = Paths.get(compilerLib).toFile
       if libdir.exists then
         val libjarFiles = libdir.listFiles.toList.take(5)

compiler/test-resources/scripting/sqlDateError_scalacli.sc

@@ -16,7 +16,11 @@ import ScriptTestEnv.*
 class BashExitCodeTests:
   private var myTmpDir: String | Null = null
   private lazy val tmpDir = { myTmpDir = Files.createTempDirectory("exit-code-tests").toFile.absPath; myTmpDir }
-  @After def cleanup(): Unit = if myTmpDir != null then io.Directory(myTmpDir).deleteRecursively()
+  @After def cleanup(): Unit = {
+    if myTmpDir != null then io.Directory(myTmpDir).deleteRecursively()
+
+    cleanupScalaCLIDirs()
+  }
 
   /** Verify the exit code of running `cmd args*`. */
   def verifyExit(cmd: String, args: String*)(expectedExitCode: Int): Unit =

compiler/test-resources/scripting/touchFile.sc

@@ -25,11 +25,13 @@ object BashScriptsTests:
   def testFiles = scripts("/scripting")
 
   @AfterClass def cleanup: Unit = {
+    cleanupScalaCLIDirs()
+
     val af = argsfile.toFile
-    if (af.exists) {
+    if af.exists then
       af.delete()
-    }
   }
+
   printf("osname[%s]\n", osname)
   printf("uname[%s]\n", ostypeFull)
   printf("using JAVA_HOME=%s\n", envJavaHome)
@@ -50,7 +52,7 @@ object BashScriptsTests:
   val testScriptArgs = Seq(
     "a", "b", "c", "-repl", "-run", "-script", "-debug"
   )
-  val Seq(showArgsScript, showArgsScalaCli) = Seq("showArgs.sc", "showArgsNu.sc").map { name =>
+  val Seq(showArgsScript, showArgsScalaCli) = Seq("showArgs.sc", "showArgs_scalacli.sc").map { name =>
     testFiles.find(_.getName == name).get.absPath
   }
 
@@ -66,7 +68,7 @@ object BashScriptsTests:
     }
     file
 
-  val Seq(envtestNuSc, envtestScala) = Seq("envtestNu.sc", "envtest.scala").map { testFile(_) }
+  val Seq(envtestNuSc, envtestScala) = Seq("envtest_scalacli.sc", "envtest.scala").map { testFile(_) }
 
   // create command line with given options, execute specified script, return stdout
   def callScript(tag: String, script: String, keyPre: String): String =
@@ -173,13 +175,13 @@ class BashScriptsTests:
         assert(stdout == expectedOutput)
 
   /*
-   * verify that scriptPathNu.sc sees a valid script.path property,
-   * and that it's value is the path to "scriptPathNu.sc".
+   * verify that scriptPath_scalacli.sc sees a valid script.path property,
+   * and that it's value is the path to "scriptPath_scalacli.sc".
    */
   @Category(Array(classOf[BootstrappedOnlyTests]))
   @Test def verifyScriptPathProperty =
     assumeFalse("Scripts do not yet support Scala 2 library TASTy", Properties.usingScalaLibraryTasty)
-    val scriptFile = testFiles.find(_.getName == "scriptPathNu.sc").get
+    val scriptFile = testFiles.find(_.getName == "scriptPath_scalacli.sc").get
     val expected = s"${scriptFile.getName}"
     printf("===> verify valid system property script.path is reported by script [%s]\n", scriptFile.getName)
     printf("calling scriptFile: %s\n", scriptFile)
@@ -196,7 +198,7 @@ class BashScriptsTests:
    */
   @Test def verifyScalaOpts =
     assumeFalse("Scripts do not yet support Scala 2 library TASTy", Properties.usingScalaLibraryTasty)
-    val scriptFile = testFiles.find(_.getName == "classpathReport.sc").get
+    val scriptFile = testFiles.find(_.getName == "classpathReport_scalacli.sc").get
     printf("===> verify SCALA_OPTS='@argsfile' is properly handled by `dist/bin/scala`\n")
     val envPairs = List(("SCALA_OPTS", s"@$argsfile"))
     val (validTest, exitCode, stdout, stderr) = bashCommand(scriptFile.absPath, envPairs)
@@ -219,7 +221,7 @@ class BashScriptsTests:
    */
   @Test def sqlDateTest =
     assumeFalse("Scripts do not yet support Scala 2 library TASTy", Properties.usingScalaLibraryTasty)
-    val scriptBase = "sqlDateErrorNu"
+    val scriptBase = "sqlDateError_scalacli"
     val scriptFile = testFiles.find(_.getName == s"$scriptBase.sc").get
     val testJar = testFile(s"$scriptBase.jar") // jar should not be created when scriptFile runs
     val tj = Paths.get(testJar).toFile

compiler/test-resources/scripting/unglobClasspath.sc

@@ -11,8 +11,12 @@ import org.junit.{Test, Ignore, AfterClass}
 import vulpix.TestConfiguration
 import ScriptTestEnv.*
 
-/** Test java command line generated by bin/scala and bin/scalac */
+object ClasspathTests:
+  @AfterClass def cleanup: Unit = {
+    cleanupScalaCLIDirs()
+  }
 
+/** Test java command line generated by bin/scala and bin/scalac */
 class ClasspathTests:
   /*
    * Test disabled (temporarily).
@@ -24,7 +28,7 @@ class ClasspathTests:
   @Ignore
   @Test def hashbangClasspathVerifyTest = {
     // only interested in classpath test scripts
-    val testScriptName = "classpathReport.sc"
+    val testScriptName = "classpathReport_scalacli.sc"
     val testScript = scripts("/scripting").find { _.getName.matches(testScriptName) } match
       case None => sys.error(s"test script not found: ${testScriptName}")
       case Some(file) => file
@@ -39,7 +43,7 @@ class ClasspathTests:
 
       cmd.foreach { printf("[%s]\n", _) }
 
-      // classpathReport.sc is expected to produce two lines:
+      // classpathReport_scalacli.sc is expected to produce two lines:
       // cwd: <current-working-directory-seen-by-the-script>
       // classpath: <classpath-seen-by-the-script>
 
@@ -51,10 +55,10 @@ class ClasspathTests:
       // convert scriptCp to a list of files
       val hashbangJars: List[File] = scriptCp.split(psep).map { _.toFile }.toList
       val hashbangClasspathJars = hashbangJars.map { _.name }.sorted.distinct // get jar basenames, remove duplicates
-      val packlibDir: String = ??? /* ??? was s"$scriptCwd/$packLibDir" */ // classpathReport.sc specifies a wildcard classpath in this directory
+      val packlibDir: String = ??? /* ??? was s"$scriptCwd/$packLibDir" */ // classpathReport_scalacli.sc specifies a wildcard classpath in this directory
       val packlibJars: List[File] = listJars(packlibDir) // classpath entries expected to have been reported by the script
 
-      printf("%d jar files in dist/target/pack/lib\n", packlibJars.size)
+      printf(s"%d jar files in $packDir/lib\n", packlibJars.size)
       printf("%d test script jars in classpath\n", hashbangClasspathJars.size)
 
       val (diff: Set[File], msg: String) = if (packlibJars.size > hashbangClasspathJars.size) {
@@ -63,7 +67,7 @@ class ClasspathTests:
         (hashbangJars.toSet -- packlibJars.toSet , "only in hashbang classpath")
       }
       // verify that the script hasbang classpath setting was effective at supplementing the classpath
-      // (a minimal subset of jars below dist/target/pack/lib are always be in the classpath)
+      // (a minimal subset of jars below dist*/target/pack/lib are always be in the classpath)
       val missingClasspathEntries = if hashbangClasspathJars.size != packlibJars.size then
         printf("packlib dir [%s]\n", packlibDir)
         printf("hashbangClasspathJars: %s\n", hashbangJars.map { _.relpath.norm }.mkString("\n ", "\n ", ""))
@@ -78,7 +82,7 @@ class ClasspathTests:
    * verify classpath is unglobbed by MainGenericRunner.
    */
   @Test def unglobClasspathVerifyTest = {
-    val testScriptName = "unglobClasspath.sc"
+    val testScriptName = "unglobClasspath_scalacli.sc"
     val testScript = scripts("/scripting").find { _.name.matches(testScriptName) } match
       case None => sys.error(s"test script not found: ${testScriptName}")
       case Some(file) => file

compiler/test-resources/scripting/unglobClasspath_scalacli.sc

@@ -55,6 +55,10 @@ class ExpressionTest:
 
 object ExpressionTest:
 
+  @AfterClass def cleanup(): Unit = {
+    cleanupScalaCLIDirs()
+  }
+
   def main(args: Array[String]): Unit =
     val tests = new ExpressionTest
     println("\n=== verifyCommandLineExpression ===")