move MainGeneric* into dist

Author: mpollmeier

.gitignore

@@ -7,7 +7,7 @@
 tags
 
 # sbt specific
-dist/*
+dist/target
 target/
 lib_managed/
 src_managed/

compiler/test-coursier/dotty/tools/coursier/CoursierScalaTests.scala

@@ -155,7 +155,7 @@ object CoursierScalaTests:
     (code, out.toList)
 
   def csScalaCmd(options: String*): List[String] =
-    csCmd("dotty.tools.MainGenericRunner", options*)
+    csCmd("dotty.dist.MainGenericRunner", options*)
 
   def csScalaCompilerCmd(options: String*): List[String] =
     csCmd("dotty.tools.dotc.Main", options*)

dist/bin/scala

@@ -65,7 +65,7 @@ done
 # exec here would prevent onExit from being called, leaving terminal in unusable state
 compilerJavaClasspathArgs
 [ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
-eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
+eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.dist.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
 scala_exit_status=$?
 
 

dist/bin/scala.bat

@@ -21,7 +21,7 @@ call :args %*
 
 call :compilerJavaClasspathArgs
 
-call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.tools.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
+call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.dist.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
 if not %ERRORLEVEL%==0 ( set _EXITCODE=1& goto end )
 
 goto end

dist/bin/scalac

@@ -88,7 +88,7 @@ eval "\"$JAVACMD\"" \
    "-classpath \"$jvm_cp_args\"" \
    "-Dscala.usejavacp=true" \
    "-Dscala.home=\"$PROG_HOME\"" \
-   "dotty.tools.MainGenericCompiler" \
+   "dotty.dist.MainGenericCompiler" \
    "${scala_args[@]}"
 
 scala_exit_status=$?

dist/bin/scalac.bat

@@ -21,7 +21,7 @@ call :args %*
 
 call :compilerJavaClasspathArgs
 
-call "%_JAVACMD%" %_JAVA_ARGS% -classpath "%_JVM_CP_ARGS%" "-Dscala.usejavacp=true" "-Dscala.home=%_PROG_HOME%" dotty.tools.MainGenericCompiler %_SCALA_ARGS%
+call "%_JAVACMD%" %_JAVA_ARGS% -classpath "%_JVM_CP_ARGS%" "-Dscala.usejavacp=true" "-Dscala.home=%_PROG_HOME%" dotty.dist.MainGenericCompiler %_SCALA_ARGS%
 if not %ERRORLEVEL%==0 (
     set _EXITCODE=1
     goto end

compiler/src/dotty/tools/MainGenericCompiler.scala renamed to dist/src/dotty/dist/MainGenericCompiler.scala

@@ -1,4 +1,4 @@
-package dotty.tools
+package dotty.dist
 
 import scala.language.unsafeNulls
 

compiler/src/dotty/tools/MainGenericRunner.scala renamed to dist/src/dotty/dist/MainGenericRunner.scala

@@ -1,4 +1,4 @@
-package dotty.tools
+package dotty.dist
 
 import scala.language.unsafeNulls
 

tests/run-with-compiler/i14541.scala

@@ -6,7 +6,7 @@ object Test:
   def main(args: Array[String]): Unit =
     getClass.getClassLoader.run("echo", List("hello", "raw", "world"))
     // caution: uses "SCALA_OPTS"
-    dotty.tools.MainGenericRunner.main(Array("--class-path", classpath, "echo", "hello", "run", "world"))
+    dotty.dist.MainGenericRunner.main(Array("--class-path", classpath, "echo", "hello", "run", "world"))
 
 @main def echo(args: String*): Unit = println {
   args.mkString(" ")