use native launchers in bash tests

cleanup Build.scala

Author: bishabosha

.github/workflows/ci.yaml

@@ -141,7 +141,8 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/buildScalaBinary
+          ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -230,7 +231,7 @@ jobs:
         shell: cmd
 
       - name: build binary
-        run: sbt "dist-win-x64/pack" & bash -version
+        run: sbt "dist-win-x86_64/pack" & bash -version
         shell: cmd
 
       - name: cygwin tests
@@ -269,8 +270,12 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v4
 
+      - name: build binary
+        run: sbt "dist-win-x86_64/pack"
+        shell: cmd
+
       - name: Test
-        run: sbt ";dist-win-x64/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test"
+        run: sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test"
         shell: cmd
 
       - name: Scala.js Test
@@ -596,7 +601,8 @@ jobs:
 
       - name: Test
         run: |
-          ./project/scripts/sbt ";dist/pack ;scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*"
+          ./project/scripts/buildScalaBinary
+          ./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/*"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 

.github/workflows/launchers.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  linux-x64:
+  linux-x86_64:
     name: Deploy and Test on Linux x64 architecture
     runs-on: ubuntu-latest
     steps:
@@ -16,8 +16,8 @@ jobs:
           distribution: 'temurin'
           cache: 'sbt'
       - name: Build the launcher command
-        run: sbt "dist-linux-x64/pack"
-      - run: ./dist/linux-x64/target/pack/bin/scala --version
+        run: sbt "dist-linux-x86_64/pack"
+      - run: ./dist/linux-x86_64/target/pack/bin/scala --version
 
   linux-aarch64:
     name: Deploy and Test on Linux ARM64 architecture
@@ -37,7 +37,7 @@ jobs:
         run: sbt "dist-linux-aarch64/pack"
       - run: ./dist/linux-aarch64/target/pack/bin/scala --version
 
-  mac-x64:
+  mac-x86_64:
     name: Deploy and Test on Mac x64 architecture
     runs-on: macos-13
     steps:
@@ -52,8 +52,8 @@ jobs:
       - name: Install sbt
         run: brew install sbt
       - name: Build the launcher command
-        run: sbt "dist-mac-x64/pack"
-      - run: ./dist/mac-x64/target/pack/bin/scala --version
+        run: sbt "dist-mac-x86_64/pack"
+      - run: ./dist/mac-x86_64/target/pack/bin/scala --version
 
   mac-aarch64:
     name: Deploy and Test on Mac ARM64 architecture
@@ -73,7 +73,7 @@ jobs:
         run: sbt "dist-mac-aarch64/pack"
       - run: ./dist/mac-aarch64/target/pack/bin/scala --version
 
-  win-x64:
+  win-x86_64:
     name: Deploy and Test on Windows x64 architecture
     runs-on: windows-latest
     steps:
@@ -85,5 +85,5 @@ jobs:
           distribution: 'temurin'
           cache: 'sbt'
       - name: Build the launcher command
-        run: sbt "dist-win-x64/pack"
-      - run: ./dist/win-x64/target/pack/bin/scala --version
+        run: sbt "dist-win-x86_64/pack"
+      - run: ./dist/win-x86_64/target/pack/bin/scala --version

bin/common

@@ -9,15 +9,18 @@ target="$1"
 
 shift # Mutates $@ by deleting the first element ($1)
 
+# set the $DIST_PROJECT and $DIST_DIR variables
+source "$ROOT/bin/common-platform"
+
 # Marker file used to obtain the date of latest call to sbt-back
-version="$ROOT/dist/target/pack/VERSION"
+version="$ROOT/$DIST_DIR/target/pack/VERSION"
 
 # Create the target if absent or if file changed in ROOT/compiler
 new_files="$(find "$ROOT/compiler" \( -iname "*.scala" -o -iname "*.java" \) -newer "$version" 2> /dev/null)"
 
 if [ ! -f "$version" ] || [ ! -z "$new_files" ]; then
   echo "Building Dotty..."
-  (cd $ROOT && sbt "dist/pack")
+  (cd $ROOT && sbt "$DIST_PROJECT/pack")
 fi
 
-"$target" "$@"
+"$ROOT/$DIST_DIR/target/pack/bin/$target" "$@"

bin/common-platform

@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+
+unset cygwin mingw msys darwin
+
+# COLUMNS is used together with command line option '-pageWidth'.
+if command -v tput >/dev/null 2>&1; then
+  export COLUMNS="$(tput -Tdumb cols)"
+fi
+
+case "`uname`" in
+  CYGWIN*) cygwin=true
+          ;;
+  MINGW*) mingw=true
+          ;;
+  MSYS*) msys=true
+          ;;
+  Darwin*) darwin=true
+           ;;
+esac
+
+unset DIST_PROJECT DIST_DIR
+
+if [[ ${cygwin-} || ${mingw-} || ${msys-} ]]; then
+  DIST_PROJECT="dist-win-x86_64"
+  DIST_DIR="dist/win-x86_64"
+else
+  # OS and arch logic taken from https://github.com/VirtusLab/scala-cli/blob/main/scala-cli.sh
+  unset arch ARCH_NORM
+  arch=$(uname -m)
+  if [[ "$arch" == "aarch64" ]] || [[ "$arch" == "x86_64" ]]; then
+    ARCH_NORM="$arch"
+  elif [[ "$arch" == "amd64" ]]; then
+    ARCH_NORM="x86_64"
+  elif [[ "$arch" == "arm64" ]]; then
+    ARCH_NORM="aarch64"
+  else
+    ARCH_NORM="unknown"
+  fi
+
+  if [ "$(expr substr $(uname -s) 1 5 2>/dev/null)" == "Linux" ]; then
+    if [[ "$ARCH_NORM" == "unknown" ]]; then
+      echo >&2 "unknown Linux CPU architecture, defaulting to JVM launcher"
+      DIST_PROJECT="dist"
+      DIST_DIR="dist"
+    else
+      DIST_PROJECT="dist-linux-$ARCH_NORM"
+      DIST_DIR="dist/linux-$ARCH_NORM"
+    fi
+  elif [ "$(uname)" == "Darwin" ]; then
+    if [[ "$ARCH_NORM" == "unknown" ]]; then
+      echo >&2 "unknown Darwin CPU architecture, defaulting to JVM launcher"
+      DIST_PROJECT="dist"
+      DIST_DIR="dist"
+    else
+      DIST_PROJECT="dist-mac-$ARCH_NORM"
+      DIST_DIR="dist/mac-$ARCH_NORM"
+    fi
+  else
+    echo >&2 "unknown OS, defaulting to JVM launcher"
+    DIST_PROJECT="dist"
+    DIST_DIR="dist"
+  fi
+fi

bin/scala

@@ -16,7 +16,7 @@ scala_args() {
         SCRIPT_ARGS+=("$@")
         break
         ;;
-      "clean")
+      "clean" | "version" | "--version" | "-version" | "help" | "--help" | "-help")
         CLI_ARGS+=("$1")
         DISABLE_BLOOP=0 # clean command should not add --offline --server=false
         shift
@@ -35,4 +35,4 @@ scala_args() {
   echo "--power ${CLI_ARGS[@]} ${SCRIPT_ARGS[@]}"
 }
 
-"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scala" $(scala_args "$@")
+"$ROOT/bin/common" "scala" $(scala_args "$@")

bin/scalac

@@ -2,4 +2,4 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scalac" "$@"
+"$ROOT/bin/common" "scalac" "$@"

bin/scaladoc

@@ -2,4 +2,4 @@
 
 ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")" >& /dev/null && pwd)/.."
 
-"$ROOT/bin/common" "$ROOT/dist/target/pack/bin/scaladoc" "$@"
+"$ROOT/bin/common" "scaladoc" "$@"

build.sbt

@@ -28,10 +28,10 @@ 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-x86_64` = Build.`dist-mac-x86_64`
 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-win-x86_64` = Build.`dist-win-x86_64`
+val `dist-linux-x86_64` = Build.`dist-linux-x86_64`
 val `dist-linux-aarch64` = Build.`dist-linux-aarch64`
 val `community-build` = Build.`community-build`
 val `sbt-community-build` = Build.`sbt-community-build`

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

@@ -25,7 +25,7 @@ class ClasspathTest {
   @Test def testWildcards(): Unit =
     val outDir = Files.createTempDirectory("classpath-test")
     try
-      val compilerLib = s"${if isWindows then "dist-win-x64" else "dist"}/target/pack/lib"
+      val compilerLib = s"${if isWindows then "dist-win-x86_64" else "dist"}/target/pack/lib"
       val libdir = Paths.get(compilerLib).toFile
       if libdir.exists then
         val libjarFiles = libdir.listFiles.toList.take(5)

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

@@ -33,7 +33,7 @@ class BashExitCodeTests:
       }, expectedExitCode, exitCode)
 
   // Helpers for running scala, scalac, and scalac without the output directory ("raw")
-  def scala(args: String*)     = verifyExit(scalaPath, ("--power" +: "--offline" +: "--server=false" +: args)*)
+  def scala(args: String*)     = verifyExit(scalaPath, ("--power" +: args :+ "--offline" :+ "--server=false")*)
   def scalacRaw(args: String*) = verifyExit(scalacPath, args*)
   def scalac(args: String*)    = scalacRaw(("-d" +: tmpDir +: args)*)
 

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

@@ -5,6 +5,7 @@ package scripting
 import scala.language.unsafeNulls
 
 import java.io.File
+import java.util.Locale
 import java.nio.file.{Path, Paths, Files}
 
 import dotty.tools.dotc.config.Properties.*
@@ -46,11 +47,23 @@ object ScriptTestEnv {
     if bspDir.isEmpty then bspDir.delete()
   }
 
-  lazy val packDir: String =
-    if winshell then
-      "dist-win-x64/target/pack"
-    else
-      "dist/target/pack"
+  lazy val nativePackDir: Option[String] = {
+    def nativeDir(os: String, arch: String) = Some(s"dist/$os-$arch/target/pack")
+    def nativeOs(os: String) = archNorm match
+      case arch @ ("aarch64" | "x86_64") => nativeDir(os, arch)
+      case _ => None
+
+    if winshell then nativeDir("win", "x86_64") // assume x86_64 for now
+    else if linux then nativeOs("linux")
+    else if mac then nativeOs("mac")
+    else None
+  }
+
+  def jvmPackDir() =
+    println("warning: unknown OS architecture combination, defaulting to JVM launcher.")
+    "dist/target/pack"
+
+  def packDir: String = nativePackDir.getOrElse(jvmPackDir())
 
   def packBinDir: String = s"$packDir/bin"
 
@@ -81,11 +94,18 @@ object ScriptTestEnv {
 
   def unameExe = which("uname")
   def ostypeFull = if unameExe.nonEmpty then exec(unameExe).mkString else ""
-  def ostype = ostypeFull.toLowerCase.takeWhile{ cc => cc >= 'a' && cc <='z' || cc >= 'A' && cc <= 'Z' }
+  def ostype = ostypeFull.toLowerCase(Locale.ROOT).takeWhile{ cc => cc >= 'a' && cc <='z' || cc >= 'A' && cc <= 'Z' }
+  def archFull = if unameExe.nonEmpty then exec(unameExe, "-m").mkString else ""
+  def archNorm = archFull match
+    case "arm64" => "aarch64"
+    case "amd64" => "x86_64"
+    case id => id
 
   def cygwin = ostype == "cygwin"
   def mingw = ostype == "mingw"
   def msys = ostype == "msys"
+  def linux = ostype == "linux"
+  def mac = ostype == "darwin"
   def winshell: Boolean = cygwin || mingw || msys
 
   def which(str: String) =

dist/bin/cli-common-platform

@@ -1,5 +1,3 @@
 #!/usr/bin/env bash
 
-source "$PROG_HOME/bin/common-java"
-
 SCALA_CLI_CMD_BASH=("\"$JAVACMD\"" "-jar \"$PROG_HOME/bin/scala-cli.jar\"")