aboutsummaryrefslogtreecommitdiff
path: root/project
diff options
context:
space:
mode:
authorGuillaume Martres <smarter@ubuntu.com>2016-11-14 21:19:36 +0100
committerGuillaume Martres <smarter@ubuntu.com>2016-11-22 01:35:07 +0100
commitc061baf8c4a81f2b1505c30a5240857411981f62 (patch)
tree2be406f8dd14155a83d4d39a382f5e4c3f8208ae /project
parent1b19afa6184a0237a803f13e8491bfcb51b7585e (diff)
downloaddotty-c061baf8c4a81f2b1505c30a5240857411981f62.tar.gz
dotty-c061baf8c4a81f2b1505c30a5240857411981f62.tar.bz2
dotty-c061baf8c4a81f2b1505c30a5240857411981f62.zip
The root project now aggregates the other projects
Before this commit, commands such as "test" would not run anything, which means that the JUnit tests were never run.
Diffstat (limited to 'project')
-rw-r--r--project/Build.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/project/Build.scala b/project/Build.scala
index c241f77bd..745c29960 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -77,10 +77,15 @@ object DottyBuild extends Build {
)
/** Projects -------------------------------------------------------------- */
+ // The root project:
+ // - aggregates other projects so that "compile", "test", etc are run on all projects at once.
+ // - publishes its own empty artifact "dotty" that depends on "dotty-library" and "dotty-compiler",
+ // this is only necessary for compatibility with sbt which currently hardcodes the "dotty" artifact name
lazy val dotty = project.in(file(".")).
+ // FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
+ aggregate(`dotty-interfaces`, `dotty-library`, `dotty-compiler`, `dotty-sbt-bridge`, `scala-library`).
dependsOn(`dotty-compiler`).
dependsOn(`dotty-library`).
- dependsOn(`dotty-interfaces`).
settings(
addCommandAlias("dotr", "dotty-compiler/dotr") ++
addCommandAlias("dotc", "dotty-compiler/dotc") ++
@@ -341,6 +346,7 @@ object DottyBuild extends Build {
lazy val bin = project.in(file("bin")).
settings(sourceStructure).
settings(
+ publishArtifact := false,
parallelExecution in Test := false,
libraryDependencies +=
"com.novocode" % "junit-interface" % "0.11" % "test"