From d8d7f574e8e3403ec9ba9bf29a898866d6281f24 Mon Sep 17 00:00:00 2001 From: Tom Grigg Date: Wed, 21 Oct 2020 16:45:38 -0700 Subject: [PATCH] Fix dangling references to dotc and dotr executables Update references from `dotc` and `dotr` to `scalac` and `scala`, respectively, as they were renamed by #9917. --- compiler/src/dotty/tools/dotc/config/CompilerCommand.scala | 4 ++-- compiler/src/dotty/tools/dotc/config/Properties.scala | 4 ++-- compiler/src/dotty/tools/dotc/core/Phases.scala | 2 +- compiler/test/debug/Gen | 4 ++-- compiler/test/debug/test | 4 ++-- compiler/test/dotty/tools/dotc/FromTastyTests.scala | 6 +++--- compiler/test/dotty/tools/vulpix/ParallelTesting.scala | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala index 82a5dead7d02..77ca5a03c0c8 100644 --- a/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala +++ b/compiler/src/dotty/tools/dotc/config/CompilerCommand.scala @@ -12,7 +12,7 @@ import scala.collection.JavaConverters._ object CompilerCommand { /** The name of the command */ - def cmdName: String = "dotc" + def cmdName: String = "scalac" private def explainAdvanced = """ |-- Notes on option parsing -- @@ -137,7 +137,7 @@ object CompilerCommand { if (summary.errors.nonEmpty) { summary.errors foreach (report.error(_)) - report.echo(" dotc -help gives more information") + report.echo(" scalac -help gives more information") Nil } else if (settings.version.value) { diff --git a/compiler/src/dotty/tools/dotc/config/Properties.scala b/compiler/src/dotty/tools/dotc/config/Properties.scala index 36d0e018bccb..ec22bad2f788 100644 --- a/compiler/src/dotty/tools/dotc/config/Properties.scala +++ b/compiler/src/dotty/tools/dotc/config/Properties.scala @@ -129,6 +129,6 @@ trait PropertiesTrait { def jdkHome: String = envOrElse("JDK_HOME", envOrElse("JAVA_HOME", javaHome)) def versionMsg: String = "Scala %s %s -- %s".format(propCategory, versionString, copyrightString) - def scalaCmd: String = if (isWin) "dotr.bat" else "dotr" - def scalacCmd: String = if (isWin) "dotc.bat" else "dotc" + def scalaCmd: String = if (isWin) "scala.bat" else "scala" + def scalacCmd: String = if (isWin) "scalac.bat" else "scalac" } diff --git a/compiler/src/dotty/tools/dotc/core/Phases.scala b/compiler/src/dotty/tools/dotc/core/Phases.scala index 1106f3fcf199..b3738dfbf056 100644 --- a/compiler/src/dotty/tools/dotc/core/Phases.scala +++ b/compiler/src/dotty/tools/dotc/core/Phases.scala @@ -263,7 +263,7 @@ object Phases { * instance, it is possible to print trees after a given phase using: * * ```bash - * $ ./bin/dotc -Xprint: sourceFile.scala + * $ ./bin/scalac -Xprint: sourceFile.scala * ``` */ def phaseName: String diff --git a/compiler/test/debug/Gen b/compiler/test/debug/Gen index c5c4d6ec60d0..7212b9cbfb62 100755 --- a/compiler/test/debug/Gen +++ b/compiler/test/debug/Gen @@ -6,8 +6,8 @@ SOURCE=$DIR/Gen.scala CLASS=./Gen.class if [ ! -e $CLASS ] || [ $SOURCE -nt $CLASS ]; then - ./bin/dotc $DIR/Gen.scala + ./bin/scalac $DIR/Gen.scala fi -./bin/dotr Gen $@ +./bin/scala Gen $@ diff --git a/compiler/test/debug/test b/compiler/test/debug/test index 603e3c1532e0..6081862448e3 100755 --- a/compiler/test/debug/test +++ b/compiler/test/debug/test @@ -4,8 +4,8 @@ DIR="$( cd "$( dirname "$0" )" && pwd )" echo "start debug test..." for file in tests/debug/*.scala; do - ./bin/dotc $file || exit 1 - ./bin/dotr -d Test > /dev/null & + ./bin/scalac $file || exit 1 + ./bin/scala -d Test > /dev/null & $DIR/Gen $file > robot expect robot 2>&1 > /dev/null diff --git a/compiler/test/dotty/tools/dotc/FromTastyTests.scala b/compiler/test/dotty/tools/dotc/FromTastyTests.scala index 4fa7dd016cd8..e6bb7190a3fa 100644 --- a/compiler/test/dotty/tools/dotc/FromTastyTests.scala +++ b/compiler/test/dotty/tools/dotc/FromTastyTests.scala @@ -16,7 +16,7 @@ class FromTastyTests { @Test def posTestFromTasty: Unit = { // Can be reproduced with // > sbt - // > dotc -Ythrough-tasty -Ycheck:all + // > scalac -Ythrough-tasty -Ycheck:all implicit val testGroup: TestGroup = TestGroup("posTestFromTasty") compileTastyInDir(s"tests${JFile.separator}pos", defaultOptions, @@ -27,8 +27,8 @@ class FromTastyTests { @Test def runTestFromTasty: Unit = { // Can be reproduced with // > sbt - // > dotc -Ythrough-tasty -Ycheck:all - // > dotr Test + // > scalac -Ythrough-tasty -Ycheck:all + // > scala Test implicit val testGroup: TestGroup = TestGroup("runTestFromTasty") compileTastyInDir(s"tests${JFile.separator}run", defaultOptions, diff --git a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala index b41c800e702d..e4cf27ed76ca 100644 --- a/compiler/test/dotty/tools/vulpix/ParallelTesting.scala +++ b/compiler/test/dotty/tools/vulpix/ParallelTesting.scala @@ -104,7 +104,7 @@ trait ParallelTesting extends RunnerOrchestration { self => |the test can be reproduced by running from SBT (prefix it with ./bin/ if you |want to run from the command line):""".stripMargin ) - sb.append("\n\ndotc ") + sb.append("\n\nscalac ") flags.all.foreach { arg => if (lineLen > maxLen) { sb.append(delimiter)