Fix classpath when executing with quoted.Expr.run

Author: nicolasstucki

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

@@ -50,14 +50,11 @@ class QuoteDriver extends Driver {
 
   override def initCtx: Context = {
     val ictx = super.initCtx.fresh
-    // TODO add compiler to java.class.path
-    val classpath = List(
-      System.getProperty("java.class.path"),
-      "../compiler/target/scala-2.12/dotty-compiler_2.12-0.6.0-bin-SNAPSHOT-nonbootstrapped.jar",
-      "../library/target/scala-2.12/dotty-library_2.12-0.6.0-bin-SNAPSHOT-nonbootstrapped.jar",
-      "../interfaces/target/dotty-interfaces-0.6.0-bin-SNAPSHOT.jar"
-    ).mkString(":")
-    ictx.settings.classpath.update(classpath)(ictx)
+    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
   }
 

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

@@ -12,6 +12,7 @@ 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);
         ArrayList<URL> cp = new ArrayList<>();
         for (String path : dir.split(":"))
             cp.add(new File(path).toURI().toURL());

dist/bin/dotr

@@ -30,6 +30,7 @@ fi
 source "$PROG_HOME/bin/common"
 
 declare -a residual_args
+declare -a system_properties
 run_repl=false
 with_compiler=false
 CLASS_PATH=""
@@ -76,6 +77,7 @@ 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\"" "${residual_args[@]}"
+  eval exec "\"$JAVACMD\"" "$DEBUG" "-classpath \"$cp_arg\"" "${system_properties[@]}" "${residual_args[@]}"
 fi

project/Build.scala

@@ -578,9 +578,9 @@ object Build {
           .toList.mkString(":")
 
         val scalaLib = findLib("scala-library")
+        val dottyLib = packageAll.value("dotty-library")
 
         def run(args: List[String]): Unit = {
-          val dottyLib = packageAll.value("dotty-library")
           val fullArgs = insertClasspathInArgs(args, s".:$dottyLib:$scalaLib")
           s"$java ${fullArgs.mkString(" ")}".!
         }
@@ -596,7 +596,9 @@ object Build {
           val asm = findLib("scala-asm")
           val dottyCompiler = packageAll.value("dotty-compiler")
           val dottyInterfaces = packageAll.value("dotty-interfaces")
-          run(insertClasspathInArgs(args1, s"$dottyCompiler:$dottyInterfaces:$asm"))
+          val deps = s"$dottyCompiler:$dottyInterfaces:$asm"
+          val args2 = s"-Ddotty.tools.dotc.classpath=$deps:$dottyLib" :: insertClasspathInArgs(args1, deps)
+          run(args2)
         } else run(args)
       },
       run := dotc.evaluated,

project/scripts/sbtTests

@@ -56,3 +56,13 @@ else
     echo "failed output check"
     exit -1
 fi
+
+echo "testing scala.quoted.Expr.run from sbt dotr"
+./project/scripts/sbt ";dotc -classpath compiler/target/scala-2.12/classes tests/run-special/quote-run.scala; dotr -with-compiler Test" > sbtdot5.out
+cat sbtdot5.out
+if grep -e "val a: Int = 3" sbtdot5.out; then
+    echo "output ok"
+else
+    echo "failed output check"
+    exit -1
+fi