Make proper dotty-optimised project/artefacts

Author: nicolasstucki

.drone.yml

@@ -29,7 +29,7 @@ pipeline:
     image: lampepfl/dotty:2017-09-08
     commands:
       - cp -R . /tmp/3/ && cd /tmp/3/
-      - ./project/scripts/sbt ";set bootstrapOptimised in ThisBuild := true ;dotty-bootstrapped/test"
+      - ./project/scripts/sbt dotty-optimised/test
 
   test_sbt:
     group: test

build.sbt

@@ -1,25 +1,30 @@
 val dotty = Build.dotty
 val `dotty-bootstrapped` = Build.`dotty-bootstrapped`
+val `dotty-optimised` = Build.`dotty-optimised`
 val `dotty-interfaces` = Build.`dotty-interfaces`
 val `dotty-doc` = Build.`dotty-doc`
 val `dotty-doc-bootstrapped` = Build.`dotty-doc-bootstrapped`
 val `dotty-bot` = Build.`dotty-bot`
 val `dotty-compiler` = Build.`dotty-compiler`
 val `dotty-compiler-bootstrapped` = Build.`dotty-compiler-bootstrapped`
+val `dotty-compiler-optimised` = Build.`dotty-compiler-optimised`
 val `dotty-library` = Build.`dotty-library`
 val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped`
+val `dotty-library-optimised` = Build.`dotty-library-optimised`
 val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge`
 val `dotty-sbt-bridge-bootstrapped` = Build.`dotty-sbt-bridge-bootstrapped`
 val `dotty-language-server` = Build.`dotty-language-server`
 val sjsSandbox = Build.sjsSandbox
 val `dotty-bench` = Build.`dotty-bench`
 val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
+val `dotty-bench-optimised` = Build.`dotty-bench-optimised`
 val `scala-library` = Build.`scala-library`
 val `scala-compiler` = Build.`scala-compiler`
 val `scala-reflect` = Build.`scala-reflect`
 val scalap = Build.scalap
 val dist = Build.dist
 val `dist-bootstrapped` = Build.`dist-bootstrapped`
+val `dist-optimised` = Build.`dist-optimised`
 
 val `sbt-dotty` = Build.`sbt-dotty`
 val `vscode-dotty` = Build.`vscode-dotty`

project/Build.scala

@@ -232,6 +232,8 @@ object Build {
     }
   )
 
+  lazy val commonOptimisedSettings = commonBootstrappedSettings ++ Seq(bootstrapOptimised := true)
+
   lazy val commonBenchmarkSettings = Seq(
     mainClass in (Jmh, run) := Some("dotty.tools.benchmarks.Bench"), // custom main for jmh:run
     javaOptions += "-DBENCH_CLASS_PATH=" + Attributed.data((fullClasspath in Compile).value).mkString("", ":", "")
@@ -286,6 +288,16 @@ object Build {
     dependsOn(`dotty-library-bootstrapped`).
     settings(commonBootstrappedSettings)
 
+  lazy val `dotty-optimised` = project.
+    aggregate(`dotty-interfaces`, `dotty-library-optimised`, `dotty-compiler-optimised`, `dotty-doc-bootstrapped`,
+      `dotty-language-server`,
+      dottySbtBridgeBootstrappedRef,
+      `scala-library`, `scala-compiler`, `scala-reflect`, scalap).
+    dependsOn(`dotty-compiler-optimised`).
+    dependsOn(`dotty-library-optimised`).
+    settings(commonOptimisedSettings)
+
+
   lazy val `dotty-interfaces` = project.in(file("interfaces")).
     settings(commonScala2Settings). // Java-only project, so this is fine
     settings(
@@ -674,6 +686,20 @@ object Build {
       }
     )
 
+  lazy val `dotty-compiler-optimised` = project.in(file("compiler")).
+    dependsOn(`dotty-interfaces`).
+    dependsOn(`dotty-library-optimised`).
+    settings(commonOptimisedSettings).
+    settings(dottyCompilerSettings).
+    settings(
+      packageAll := {
+        (packageAll in `dotty-compiler`).value ++ Seq(
+          ("dotty-compiler" -> (packageBin in Compile).value.getAbsolutePath),
+          ("dotty-library" -> (packageBin in (`dotty-library-optimised`, Compile)).value.getAbsolutePath)
+        )
+      }
+    )
+
   // Settings shared between dotty-library and dotty-library-bootstrapped
   lazy val dottyLibrarySettings = Seq(
       libraryDependencies ++= Seq(
@@ -694,6 +720,14 @@ object Build {
       scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath)
     )
 
+  lazy val `dotty-library-optimised`: Project = project.in(file("library")).
+    settings(commonOptimisedSettings).
+    settings(dottyLibrarySettings).
+    settings(
+      // Needed so that the library sources are visible when `dotty.tools.dotc.core.Definitions#init` is called.
+      scalacOptions in Compile ++= Seq("-sourcepath", (scalaSource in Compile).value.getAbsolutePath)
+    )
+
   // until sbt/sbt#2402 is fixed (https://github.com/sbt/sbt/issues/2402)
   lazy val cleanSbtBridge = TaskKey[Unit]("cleanSbtBridge", "delete dotty-sbt-bridge cache")
 
@@ -832,6 +866,12 @@ object Build {
     settings(unmanagedSourceDirectories in Compile ++= Seq(baseDirectory.value / ".." / "bench" / "src")).
     enablePlugins(JmhPlugin)
 
+  lazy val `dotty-bench-optimised` = project.in(file("bench-optimised")).
+    dependsOn(`dotty-compiler-optimised`).
+    settings(commonOptimisedSettings ++ commonBenchmarkSettings).
+    settings(unmanagedSourceDirectories in Compile ++= Seq(baseDirectory.value / ".." / "bench" / "src")).
+    enablePlugins(JmhPlugin)
+
   // Depend on dotty-library so that sbt projects using dotty automatically
   // depend on the dotty-library
   lazy val `scala-library` = project.
@@ -1151,4 +1191,15 @@ object Build {
     settings(
       target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
     )
+
+  lazy val `dist-optimised` = project.
+    dependsOn(`dotty-interfaces`).
+    dependsOn(`dotty-library-optimised`).
+    dependsOn(`dotty-compiler-optimised`).
+    dependsOn(`dotty-doc-bootstrapped`).
+    settings(commonOptimisedSettings).
+    settings(commonDistSettings).
+    settings(
+      target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
+    )
 }