Skip to content

Commit e4ac396

Browse files
committed
move MainGeneric* into dist
1 parent ac9d5f7 commit e4ac396

File tree

9 files changed

+9
-9
lines changed

9 files changed

+9
-9
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
tags
88

99
# sbt specific
10-
dist/*
10+
dist/target
1111
target/
1212
lib_managed/
1313
src_managed/

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ object CoursierScalaTests:
155155
(code, out.toList)
156156

157157
def csScalaCmd(options: String*): List[String] =
158-
csCmd("dotty.tools.MainGenericRunner", options*)
158+
csCmd("dotty.dist.MainGenericRunner", options*)
159159

160160
def csScalaCompilerCmd(options: String*): List[String] =
161161
csCmd("dotty.tools.dotc.Main", options*)

dist/bin/scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ done
6565
# exec here would prevent onExit from being called, leaving terminal in unusable state
6666
compilerJavaClasspathArgs
6767
[ -z "${ConEmuPID-}" -o -n "${cygwin-}" ] && export MSYSTEM= PWD= # workaround for #12405
68-
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.tools.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
68+
eval "\"$JAVACMD\"" "${java_args[@]}" "-Dscala.home=\"$PROG_HOME\"" "-classpath \"$jvm_cp_args\"" "dotty.dist.MainGenericRunner" "-classpath \"$jvm_cp_args\"" "${scala_args[@]}"
6969
scala_exit_status=$?
7070

7171

dist/bin/scala.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ call :args %*
2121

2222
call :compilerJavaClasspathArgs
2323

24-
call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.tools.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
24+
call "%_JAVACMD%" %_JAVA_ARGS% "-Dscala.home=%_PROG_HOME%" -classpath "%_JVM_CP_ARGS%" dotty.dist.MainGenericRunner -classpath "%_JVM_CP_ARGS%" %_SCALA_ARGS%
2525
if not %ERRORLEVEL%==0 ( set _EXITCODE=1& goto end )
2626

2727
goto end

dist/bin/scalac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ eval "\"$JAVACMD\"" \
8888
"-classpath \"$jvm_cp_args\"" \
8989
"-Dscala.usejavacp=true" \
9090
"-Dscala.home=\"$PROG_HOME\"" \
91-
"dotty.tools.MainGenericCompiler" \
91+
"dotty.dist.MainGenericCompiler" \
9292
"${scala_args[@]}"
9393

9494
scala_exit_status=$?

dist/bin/scalac.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ call :args %*
2121

2222
call :compilerJavaClasspathArgs
2323

24-
call "%_JAVACMD%" %_JAVA_ARGS% -classpath "%_JVM_CP_ARGS%" "-Dscala.usejavacp=true" "-Dscala.home=%_PROG_HOME%" dotty.tools.MainGenericCompiler %_SCALA_ARGS%
24+
call "%_JAVACMD%" %_JAVA_ARGS% -classpath "%_JVM_CP_ARGS%" "-Dscala.usejavacp=true" "-Dscala.home=%_PROG_HOME%" dotty.dist.MainGenericCompiler %_SCALA_ARGS%
2525
if not %ERRORLEVEL%==0 (
2626
set _EXITCODE=1
2727
goto end

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.tools
1+
package dotty.dist
22

33
import scala.language.unsafeNulls
44

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package dotty.tools
1+
package dotty.dist
22

33
import scala.language.unsafeNulls
44

tests/run-with-compiler/i14541.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ object Test:
66
def main(args: Array[String]): Unit =
77
getClass.getClassLoader.run("echo", List("hello", "raw", "world"))
88
// caution: uses "SCALA_OPTS"
9-
dotty.tools.MainGenericRunner.main(Array("--class-path", classpath, "echo", "hello", "run", "world"))
9+
dotty.dist.MainGenericRunner.main(Array("--class-path", classpath, "echo", "hello", "run", "world"))
1010

1111
@main def echo(args: String*): Unit = println {
1212
args.mkString(" ")

0 commit comments

Comments
 (0)