separate lib from compiler

Author: felixmulder

bin/common

@@ -74,6 +74,7 @@ function build_jar {
 function update_packages {
     echo "$INTERFACES_JAR" >  $DOTTY_ROOT/.packages
     echo "$MAIN_JAR"       >> $DOTTY_ROOT/.packages
+    echo "$DOTTY_LIB_JAR"  >> $DOTTY_ROOT/.packages
     echo "$TEST_JAR"       >> $DOTTY_ROOT/.packages
 }
 
@@ -84,10 +85,14 @@ function build_all {
     INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)
     printf "done\n"
 
-    printf "Building dotty..."
+    printf "Building dotty-compiler..."
     MAIN_JAR=$(build_jar package "target/scala-$SCALA_BINARY_VERSION")
     printf "done\n"
 
+    printf "Building dotty library..."
+    DOTTY_LIB_JAR=$(build_jar dotty-library/package "library/target/scala-$SCALA_BINARY_VERSION")
+    printf "done\n"
+
     printf "Building tests..."
     TEST_JAR=$(build_jar test:package "target/scala-$SCALA_BINARY_VERSION" '/dotty.*-tests\.jar/p')
     printf "done\n"
@@ -101,10 +106,11 @@ if  [ ! -f "$DOTTY_ROOT/.packages" ]; then
 else
     IFS=$'\r\n' GLOBIGNORE='*' command eval 'JARS=($(cat $DOTTY_ROOT/.packages))'
 
-    if [ "${#JARS[@]}" == "3" ]; then
+    if [ "${#JARS[@]}" == "4" ]; then
         INTERFACES_JAR="${JARS[0]}"
         MAIN_JAR="${JARS[1]}"
-        TEST_JAR="${JARS[2]}"
+        DOTTY_LIB_JAR="${JARS[2]}"
+        TEST_JAR="${JARS[3]}"
     else
         echo "Failed to parse .packages file"
         build_all
@@ -126,6 +132,7 @@ function check_jar {
 
 check_jar "dotty-interfaces" $INTERFACES_JAR "interfaces" 'INTERFACES_JAR=$(build_jar dotty-interfaces/package interfaces/target)'
 check_jar "dotty"            $MAIN_JAR       "src"        'MAIN_JAR=$(build_jar package target/scala-$SCALA_BINARY_VERSION)'
+check_jar "dotty-library"    $DOTTY_LIB_JAR  "library"    'DOTTY_LIB_JAR=$(build_jar dotty-library/package library/target/scala-$SCALA_BINARY_VERSION)'
 check_jar "dotty-tests"      $TEST_JAR       "test"       'TEST_JAR=$(build_jar test:package target/scala-$SCALA_BINARY_VERSION /dotty.*-tests\.jar/p)'
 
 # Autodetecting the scala-library location, in case it wasn't provided by an environment variable

bin/dotc

@@ -115,12 +115,12 @@ trap onExit INT
 classpathArgs () {
   if [[ "true" == $bootstrapped ]]; then
     check_jar "dotty-bootstrapped" $DOTTY_JAR "target" 'build_jar "test:runMain dotc.build" target' &> /dev/null
-    toolchain="$DOTTY_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$DOTTY_JAR:$DOTTY_LIB_JAR:$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
   else
-    toolchain="$SCALA_LIBRARY_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
+    toolchain="$SCALA_LIBRARY_JAR:$DOTTY_LIB_JAR:$SCALA_REFLECT_JAR:$SCALA_COMPILER_JAR:$SBT_INTERFACE_JAR"
   fi
-  bcpJars="$INTERFACES_JAR:$MAIN_JAR"
-  cpJars="$INTERFACES_JAR:$MAIN_JAR:$TEST_JAR"
+  bcpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR"
+  cpJars="$INTERFACES_JAR:$MAIN_JAR:$DOTTY_LIB_JAR:$TEST_JAR"
 
   if [[ -n "$cygwin" ]]; then
     if [[ "$OS" = "Windows_NT" ]] && cygpath -m .>/dev/null 2>/dev/null ; then

src/dotty/DottyPredef.scala renamed to library/src/dotty/DottyPredef.scala

@@ -51,6 +51,15 @@ object DottyBuild extends Build {
   private val overrideScalaVersionSetting =
     ivyScala := ivyScala.value.map(_.copy(overrideScalaVersion = true))
 
+  // set sources to src/, tests to test/ and resources to resources/
+  lazy val sourceStructure = Seq(
+    scalaSource       in Compile := baseDirectory.value / "src",
+    scalaSource       in Test    := baseDirectory.value / "test",
+    javaSource        in Compile := baseDirectory.value / "src",
+    javaSource        in Test    := baseDirectory.value / "test",
+    resourceDirectory in Compile := baseDirectory.value / "resources"
+  )
+
   lazy val `dotty-interfaces` = project.in(file("interfaces")).
     settings(
       // Do not append Scala versions to the generated artifacts
@@ -62,17 +71,15 @@ object DottyBuild extends Build {
     ).
     settings(publishing)
 
-  lazy val dotty = project.in(file(".")).
+  lazy val `dotty-compiler` = project.in(file(".")).
     dependsOn(`dotty-interfaces`).
+    dependsOn(`dotty-library`).
+    settings(sourceStructure).
     settings(
       overrideScalaVersionSetting,
 
-      // set sources to src/, tests to test/ and resources to resources/
-      scalaSource in Compile := baseDirectory.value / "src",
-      javaSource in Compile := baseDirectory.value / "src",
-      scalaSource in Test := baseDirectory.value / "test",
-      javaSource in Test := baseDirectory.value / "test",
-      resourceDirectory in Compile := baseDirectory.value / "resources",
+      // necessary evil: dottydoc currently needs to be included in the dotty
+      // project, for sbt integration
       unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value),
       unmanagedSourceDirectories in Compile += baseDirectory.value / "dottydoc" / "src",
       unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value),
@@ -130,7 +137,7 @@ object DottyBuild extends Build {
         val args = Def.spaceDelimited("<arg>").parsed
         val jars = Seq((packageBin in Compile).value.getAbsolutePath) ++
             getJarPaths(partestDeps.value, ivyPaths.value.ivyHome)
-        val dottyJars  = "-dottyJars " + (jars.length + 1) + " dotty.jar" + " " + jars.mkString(" ")
+        val dottyJars  = "-dottyJars " + (jars.length + 2) + " dotty.jar dotty-lib.jar" + " " + jars.mkString(" ")
         // Provide the jars required on the classpath of run tests
         runTask(Test, "dotty.partest.DPConsoleRunner", dottyJars + " " + args.mkString(" "))
       },
@@ -211,17 +218,26 @@ object DottyBuild extends Build {
     ).
     settings(publishing)
 
+  lazy val `dotty-library` = project.in(file("library")).
+    settings(sourceStructure).
+    settings(
+      libraryDependencies ++= Seq(
+        "org.scala-lang" % "scala-reflect" % scalaVersion.value,
+        "org.scala-lang" % "scala-library" % scalaVersion.value
+      )
+    )
+
   // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)
   lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache")
 
   lazy val `dotty-sbt-bridge` = project.in(file("sbt-bridge")).
-    dependsOn(dotty).
+    dependsOn(`dotty-compiler`).
     settings(
       overrideScalaVersionSetting,
 
       cleanSbtBridge := {
         val dottyBridgeVersion = version.value
-        val dottyVersion = (version in dotty).value
+        val dottyVersion = (version in `dotty-compiler`).value
         val classVersion = System.getProperty("java.class.version")
 
         val sbtV = sbtVersion.value
@@ -335,11 +351,11 @@ object DottyInjectedPlugin extends AutoPlugin {
     )))
 
   lazy val `dotty-bench` = project.in(file("bench")).
-    dependsOn(dotty % "compile->test").
+    dependsOn(`dotty-compiler` % "compile->test").
     settings(
       overrideScalaVersionSetting,
 
-      baseDirectory in (Test,run) := (baseDirectory in dotty).value,
+      baseDirectory in (Test,run) := (baseDirectory in `dotty-compiler`).value,
 
       libraryDependencies ++= Seq(
         scalaCompiler % Test,
@@ -474,7 +490,7 @@ object DottyInjectedPlugin extends AutoPlugin {
         def cpToString(cp: Seq[File]) =
           cp.map(_.getAbsolutePath).mkString(java.io.File.pathSeparator)
 
-        val compilerCp = Attributed.data((fullClasspath in (dotty, Compile)).value)
+        val compilerCp = Attributed.data((fullClasspath in (`dotty-compiler`, Compile)).value)
         val cpStr = cpToString(classpath ++ compilerCp)
 
         // List all my dependencies (recompile if any of these changes)