Simplify compiler classpath for dotr

Author: nicolasstucki

compiler/src/dotty/tools/dotc/quoted/QuoteDriver.scala

@@ -50,11 +50,8 @@ class QuoteDriver extends Driver {
 
   override def initCtx: Context = {
     val ictx = super.initCtx.fresh
-    val compilerClasspath = System.getProperty("dotty.tools.dotc.classpath")
-    assert(compilerClasspath ne null, "System property `dotty.tools.dotc.classpath` is not set.")
     val classpath = System.getProperty("java.class.path")
-    val scalaLib = classpath.split(":").filter(_.contains("scala-library")).mkString(":")
-    ictx.settings.classpath.update(compilerClasspath + ":" + scalaLib)(ictx)
+    ictx.settings.classpath.update(classpath)(ictx)
     ictx
   }
 

compiler/test/dotty/tools/vulpix/ChildJVMMain.java

@@ -12,7 +12,9 @@ public class ChildJVMMain {
     static final String MessageEnd = "##THIS IS THE END FOR ME, GOODBYE##";
 
     private static void runMain(String dir) throws Exception {
-        System.setProperty("dotty.tools.dotc.classpath", dir);
+        String jcp = System.getProperty("java.class.path");
+        System.setProperty("java.class.path", jcp == null ? dir : dir + ":" + jcp);
+
         ArrayList<URL> cp = new ArrayList<>();
         for (String path : dir.split(":"))
             cp.add(new File(path).toURI().toURL());

dist/bin/dotr

@@ -30,7 +30,6 @@ fi
 source "$PROG_HOME/bin/common"
 
 declare -a residual_args
-declare -a system_properties
 run_repl=false
 with_compiler=false
 CLASS_PATH=""
@@ -77,7 +76,6 @@ else
   fi
   if [ $with_compiler == true ]; then
     cp_arg+="$PSEP$DOTTY_COMP$PSEP$DOTTY_INTF$PSEP$SCALA_ASM"
-    system_properties+=("-Ddotty.tools.dotc.classpath=$DOTTY_COMP$PSEP$DOTTY_LIB$PSEP$DOTTY_INTF$PSEP$SCALA_ASM")
   fi
-  eval exec "\"$JAVACMD\"" "$DEBUG" "-classpath \"$cp_arg\"" "${system_properties[@]}" "${residual_args[@]}"
+  eval exec "\"$JAVACMD\"" "$DEBUG" "-classpath \"$cp_arg\"" "${residual_args[@]}"
 fi

project/Build.scala

@@ -596,9 +596,7 @@ object Build {
           val asm = findLib("scala-asm")
           val dottyCompiler = packageAll.value("dotty-compiler")
           val dottyInterfaces = packageAll.value("dotty-interfaces")
-          val deps = s"$dottyCompiler:$dottyInterfaces:$asm"
-          val args2 = s"-Ddotty.tools.dotc.classpath=$deps:$dottyLib" :: insertClasspathInArgs(args1, deps)
-          run(args2)
+          run(insertClasspathInArgs(args1, s"$dottyCompiler:$dottyInterfaces:$asm"))
         } else run(args)
       },
       run := dotc.evaluated,