Skip to content

Commit

Permalink
Generate aggregate coverage but publish a single Jar (#695)
Browse files Browse the repository at this point in the history
* Generate aggregate coverage but publish a single Jar

* Reduce the aggressive dis-aggregation as it breaks super project aggregation.
  • Loading branch information
ucbjrl authored Sep 20, 2017
1 parent 6a57642 commit 7af4163
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
Expand Down

0 comments on commit 7af4163

Please sign in to comment.