restore missing main class name to jvm launch command line

Author: philwalk

dist/bin/common

@@ -192,6 +192,11 @@ classpathArgs () {
 
 default_java_opts="-Xmx768m -Xms768m"
 
+CompilerMain=dotty.tools.dotc.Main
+DecompilerMain=dotty.tools.dotc.decompiler.Main
+ReplMain=dotty.tools.repl.Main
+ScriptingMain=dotty.tools.scripting.Main
+
 addJava () {
   java_args+=("'$1'")
 }
@@ -207,11 +212,6 @@ addScripting () {
 prepScalacCommandLine () {
   withCompiler=true
 
-  CompilerMain=dotty.tools.dotc.Main
-  DecompilerMain=dotty.tools.dotc.decompiler.Main
-  ReplMain=dotty.tools.repl.Main
-  ScriptingMain=dotty.tools.scripting.Main
-
   while [[ $# -gt 0 ]]; do
   case "$1" in
              --) shift; for arg; do addResidual "$arg"; done; set -- ;;

dist/bin/scalac

@@ -33,6 +33,15 @@ PROG_NAME=$CompilerMain
 prepScalacCommandLine "$@"
 
 # exec here would prevent onExit from being called, leaving terminal in unusable state
-eval "\"$JAVACMD\"" "$DEBUG"  "-classpath \"$cp_arg\"" "${java_args[@]}" "${residual_args[@]}"
+eval "\"$JAVACMD\"" \
+     ${JAVA_OPTS:-$default_java_opts} \
+     "${DEBUG-}" \
+     "${java_args[@]}" \
+     "$jvm_cp_args" \
+     -Dscala.usejavacp=true \
+     "$PROG_NAME"  \
+     "${scala_args[@]}" \
+     "${residual_args[@]}" \
+     "${scripting_string-}"
 scala_exit_status=$?
 

dist/bin/scaladoc

@@ -27,7 +27,7 @@ if [ -z "$PROG_HOME" ] ; then
 fi
 
 source "$PROG_HOME/bin/common"
-
+default_java_opts="-Xmx768m -Xms768m"
 withCompiler=true
 
 CompilerMain=dotty.tools.dotc.Main