diff options
| -rw-r--r-- | build.sbt | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -137,9 +137,7 @@ 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"). - // The following is required until sbt-scoverage correctly deals with inDependencies - // Unfortunately, it also revives publishing of the subproject jars. Disable until the latter is resolved (again). - //aggregate(coreMacros, chiselFrontend). + aggregate(coreMacros, chiselFrontend). settings( scalacOptions in Test ++= Seq("-language:reflectiveCalls"), scalacOptions in Compile in doc ++= Seq( @@ -149,7 +147,13 @@ lazy val chisel = (project in file(".")). "-doc-title", name.value, "-doc-root-content", baseDirectory.value+"/root-doc.txt" ), - aggregate in doc := false, + // 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, |