Rename binaries from e.g. dotc to scalac

Author: anatoliykmetyuk

.gitignore

@@ -24,7 +24,7 @@ local.sbt
 # npm
 node_modules
 
-# VS Code 
+# VS Code
 .vscode/
 # Metals
 .bloop/
@@ -87,3 +87,4 @@ community-build/sbt-dotty-sbt
 
 # Vulpix output files
 *.check.out
+!/dist/bin/

bin/dotc renamed to bin/scalac

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

bin/dotd renamed to bin/scalad

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

bin/dotr renamed to bin/scalar

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

bin/test/TestScripts.scala

@@ -45,53 +45,53 @@ class TestScripts {
   @Before def buildUp  = deletePackages
   @After  def tearDown = deletePackages
 
-  /** bin/dotc script should be able to build hello world and successfully
-   *  execute it using dotr
+  /** bin/scalac script should be able to build hello world and successfully
+   *  execute it using scalar
    */
   @Test def buildAndRunHelloWorld = doUnlessWindows {
-    val (retDotc, dotcOutput) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    val (retDotc, dotcOutput) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
 
-    // Check correct output of building and running dotc
+    // Check correct output of building and running scalac
     assert(
       retDotc == 0,
-      s"bin/dotc script did not run properly. Output:$lineSep$dotcOutput"
+      s"bin/scalac script did not run properly. Output:$lineSep$dotcOutput"
     )
 
-    val (retDotr, dotrOutput) = executeScript("./bin/dotr HelloWorld")
+    val (retDotr, dotrOutput) = executeScript("./bin/scalar HelloWorld")
     assert(
       retDotr == 0 && dotrOutput == "hello world\n",
       s"Running hello world exited with status: $retDotr and output: $dotrOutput"
     )
   }
 
-  /** bin/dotc script should be able to detect changes in dotty sources and
+  /** bin/scalac script should be able to detect changes in dotty sources and
    *  rebuild dotty if needed
    */
   @Test def rebuildIfNecessary = doUnlessWindows {
-    val (retFirstBuild, out1) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
-    assert(retFirstBuild == 0, s"building dotc failed: $out1")
+    val (retFirstBuild, out1) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
+    assert(retFirstBuild == 0, s"building scalac failed: $out1")
 
     // Create a new file to force rebuild
     new JFile("./compiler/src/dotty/tools/dotc/Dummy.scala").createNewFile()
 
-    val (retSecondBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    val (retSecondBuild, output) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
     assert(
       retSecondBuild == 0 && output.contains("rebuilding"),
       s"Rebuilding the tool should result in jar files being rebuilt. Status: $retSecondBuild, output:$lineSep$output")
   }
 
-  /** if no changes to dotty, dotc script should be fast */
+  /** if no changes to dotty, scalac script should be fast */
   @Test def beFastOnNoChanges = doUnlessWindows {
-    val (retFirstBuild, _) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
-    assert(retFirstBuild == 0, "building dotc failed")
+    val (retFirstBuild, _) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
+    assert(retFirstBuild == 0, "building scalac failed")
 
-    val (ret, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    val (ret, output) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
     assert(
       ret == 0 && !output.contains("rebuilding"),
       s"Project recompiled when it didn't need to be. Status $ret, output:$lineSep$output")
   }
 
-  /** dotc script should work after corrupting .packages */
+  /** scalac script should work after corrupting .packages */
   @Test def reCreatesPackagesIfNecessary = doUnlessWindows {
     import java.nio.file.{Paths, Files}
     import java.nio.charset.StandardCharsets
@@ -104,8 +104,8 @@ class TestScripts {
 
     Files.write(Paths.get("./.packages"), contents.getBytes(StandardCharsets.UTF_8))
 
-    val (retFirstBuild, output) = executeScript("./bin/dotc ./tests/pos/HelloWorld.scala")
+    val (retFirstBuild, output) = executeScript("./bin/scalac ./tests/pos/HelloWorld.scala")
     assert(output.contains(".packages file corrupted"))
-    assert(retFirstBuild == 0, "building dotc failed")
+    assert(retFirstBuild == 0, "building scalac failed")
   }
 }

dist/bin/common

@@ -104,11 +104,11 @@ find_lib () {
   fi
 }
 
-DOTTY_COMP=$(find_lib "*dotty-compiler*")
-DOTTY_INTF=$(find_lib "*dotty-interfaces*")
-DOTTY_LIB=$(find_lib "*dotty-library*")
-DOTTY_STAGING=$(find_lib "*dotty-staging*")
-DOTTY_TASTY_INSPECTOR=$(find_lib "*dotty-tasty-inspector*")
+DOTTY_COMP=$(find_lib "*scala3-compiler*")
+DOTTY_INTF=$(find_lib "*scala3-interfaces*")
+DOTTY_LIB=$(find_lib "*scala3-library*")
+DOTTY_STAGING=$(find_lib "*scala3-staging*")
+DOTTY_TASTY_INSPECTOR=$(find_lib "*scala3-tasty-inspector*")
 TASTY_CORE=$(find_lib "*tasty-core*")
 SCALA_ASM=$(find_lib "*scala-asm*")
 SCALA_LIB=$(find_lib "*scala-library*")

dist/bin/dotc renamed to dist/bin/scalac

@@ -89,8 +89,8 @@ if [ $execute_repl == true ] || ([ $execute_run == false ] && [ $options_indicat
   if [ "$CLASS_PATH" ]; then
     cp_arg="-classpath \"$CLASS_PATH\""
   fi
-  echo "Starting dotty REPL..."
-  eval "\"$PROG_HOME/bin/dotc\" $cp_arg ${java_options[@]} -repl ${residual_args[@]}"
+  echo "Starting scala3 REPL..."
+  eval "\"$PROG_HOME/bin/scalac\" $cp_arg ${java_options[@]} -repl ${residual_args[@]}"
 elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
   cp_arg="$DOTTY_LIB$PSEP$SCALA_LIB"
   if [ -z "$CLASS_PATH" ]; then
@@ -99,7 +99,7 @@ elif [ $execute_repl == true ] || [ ${#residual_args[@]} -ne 0 ]; then
     cp_arg+="$PSEP$CLASS_PATH"
   fi
   if [ "$class_path_count" -gt 1 ]; then
-    echo "warning: multiple classpaths are found, dotr only use the last one."
+    echo "warning: multiple classpaths are found, scalar only use the last one."
   fi
   if [ $with_compiler == true ]; then
     cp_arg+="$PSEP$DOTTY_COMP$PSEP$TASTY_CORE$PSEP$DOTTY_INTF$PSEP$SCALA_ASM$PSEP$DOTTY_STAGING$PSEP$DOTTY_TASTY_INSPECTOR"