Factor compiler jar path settings

Author: nicolasstucki

project/Build.scala

@@ -431,8 +431,29 @@ object Build {
   def findArtifactPath(classpath: Def.Classpath, name: String): String =
     findArtifact(classpath, name).getAbsolutePath
 
+  // Settings shared between dotty-compiler, dotty-compiler-bootstrapped and dotty-staging
+  lazy val commonDottyJarClasspathSettings = Seq(
+    // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
+    // packageAll should always be run before tests
+    javaOptions ++= {
+      val externalDeps = externalCompilerClasspathTask.value
+      val jars = packageAll.in(LocalProject("dotty-compiler-bootstrapped")).value
+
+      List(
+        "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"),
+        "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"),
+        "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"),
+        "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
+        "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
+        "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
+        "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
+        "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader")
+      )
+    }
+  )
+
   // Settings shared between dotty-compiler and dotty-compiler-bootstrapped
-  lazy val commonDottyCompilerSettings = Seq(
+  lazy val commonDottyCompilerSettings = commonDottyJarClasspathSettings ++ Seq(
       // set system in/out for repl
       connectInput in run := true,
       outputStrategy := Some(StdoutOutput),
@@ -490,9 +511,6 @@ object Build {
       // http://grokbase.com/t/gg/simple-build-tool/135ke5y90p/sbt-setting-jvm-boot-paramaters-for-scala
       // packageAll should always be run before tests
       javaOptions ++= {
-        val externalDeps = externalCompilerClasspathTask.value
-        val jars = packageAll.value
-
         val ci_build = // propagate if this is a ci build
           sys.props.get("dotty.drone.mem") match {
             case Some(prop) => List("-Xmx" + prop)
@@ -512,19 +530,10 @@ object Build {
           (sourceManaged in Compile).value
         }
 
-        val jarOpts = List(
-          "-Ddotty.tests.dottyCompilerManagedSources=" + managedSrcDir,
-          "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"),
-          "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"),
-          "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"),
-          "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
-          "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
-          "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
-          "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
-          "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader")
-        )
+        val jarOpt =
+          "-Ddotty.tests.dottyCompilerManagedSources=" + managedSrcDir
 
-        jarOpts ::: tuning ::: agentOptions ::: ci_build
+        jarOpt :: tuning ::: agentOptions ::: ci_build
       },
 
       testCompilation := Def.inputTaskDyn {
@@ -754,23 +763,13 @@ object Build {
     dependsOn(dottyCompiler(Bootstrapped)).
     dependsOn(dottyCompiler(Bootstrapped) % "test->test").
     settings(commonBootstrappedSettings).
+    settings(commonDottyJarClasspathSettings).
     settings(
       fork in run := true,
       fork in Test := true,
       javaOptions ++= {
-        val externalDeps = externalCompilerClasspathTask.value
         val jars = packageAll.in(`dotty-compiler-bootstrapped`).value
-        List(
-          "-Ddotty.tests.classes.dottyInterfaces=" + jars("dotty-interfaces"),
-          "-Ddotty.tests.classes.dottyLibrary=" + jars("dotty-library"),
-          "-Ddotty.tests.classes.dottyCompiler=" + jars("dotty-compiler"),
-          "-Ddotty.tests.classes.dottyStaging=" + jars("dotty-staging"),
-          "-Ddotty.tests.classes.compilerInterface=" + findArtifactPath(externalDeps, "compiler-interface"),
-          "-Ddotty.tests.classes.scalaLibrary=" + findArtifactPath(externalDeps, "scala-library"),
-          "-Ddotty.tests.classes.scalaAsm=" + findArtifactPath(externalDeps, "scala-asm"),
-          "-Ddotty.tests.classes.jlineTerminal=" + findArtifactPath(externalDeps, "jline-terminal"),
-          "-Ddotty.tests.classes.jlineReader=" + findArtifactPath(externalDeps, "jline-reader")
-        )
+        List("-Ddotty.tests.classes.dottyStaging=" + jars("dotty-staging"))
       }
     )