summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.sbt17
1 files changed, 7 insertions, 10 deletions
diff --git a/build.sbt b/build.sbt
index ffd487ad..952a2a4c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -136,16 +136,6 @@ lazy val chisel = (project in file(".")).
// Prevent separate JARs from being generated for coreMacros and chiselFrontend.
dependsOn(coreMacros % "compile-internal;test-internal").
dependsOn(chiselFrontend % "compile-internal;test-internal").
- // Disable aggregation in general, but enable it for specific tasks.
- // Otherwise we get separate Jar files for each subproject and we
- // go to great pains to package all chisel3 core code in a single Jar.
- // If you get errors indicating coverageReport is undefined, be sure
- // you have sbt-scoverage in project/plugins.sbt
- aggregate(coreMacros, chiselFrontend).
- settings(
- aggregate := false,
- aggregate in coverageReport := true
- ).
settings(
scalacOptions in Test ++= Seq("-language:reflectiveCalls"),
scalacOptions in Compile in doc ++= Seq(
@@ -155,6 +145,13 @@ lazy val chisel = (project in file(".")).
"-doc-title", name.value,
"-doc-root-content", baseDirectory.value+"/root-doc.txt"
),
+ // Disable aggregation in general, but enable it for specific tasks.
+ // Otherwise we get separate Jar files for each subproject and we
+ // go to great pains to package all chisel3 core code in a single Jar.
+ // If you get errors indicating coverageReport is undefined, be sure
+ // you have sbt-scoverage in project/plugins.sbt
+ aggregate := false,
+ aggregate in coverageReport := true,
// Include macro classes, resources, and sources main JAR.
mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value,
mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value,