diff options
| -rw-r--r-- | build.sbt | 26 |
1 files changed, 4 insertions, 22 deletions
@@ -123,14 +123,10 @@ lazy val chiselSettings = Seq ( ) lazy val coreMacros = (project in file("coreMacros")). - settings(commonSettings: _*). - // Prevent separate JARs from being generated for coreMacros. - settings(skip in publish := true) + settings(commonSettings: _*) lazy val chiselFrontend = (project in file("chiselFrontend")). settings(commonSettings: _*). - // Prevent separate JARs from being generated for chiselFrontend. - settings(skip in publish := true). settings( scalacOptions := scalacOptions.value ++ Seq( "-deprecation", @@ -159,14 +155,8 @@ lazy val chisel = (project in file(".")). settings(commonSettings: _*). settings(chiselSettings: _*). settings(publishSettings: _*). - dependsOn(coreMacros % "compile-internal;test-internal"). - dependsOn(chiselFrontend % "compile-internal;test-internal"). - // We used to have to disable aggregation in general in order to suppress - // creation of subproject JARs (coreMacros and chiselFrontend) during publishing. - // This had the unfortunate side-effect of suppressing coverage tests and scaladoc generation in subprojects. - // The "skip in publish := true" setting in subproject settings seems to be - // sufficient to suppress subproject JAR creation, so we can restore - // general aggregation, and thus get coverage tests and scaladoc for subprojects. + dependsOn(coreMacros). + dependsOn(chiselFrontend). aggregate(coreMacros, chiselFrontend). settings( scalacOptions in Test ++= Seq("-language:reflectiveCalls"), @@ -189,13 +179,5 @@ lazy val chisel = (project in file(".")). } s"https://github.com/freechipsproject/chisel3/tree/$branch/€{FILE_PATH}.scala" } - ), - // Include macro classes, resources, and sources main JAR since we don't create subproject JARs. - mappings in (Compile, packageBin) ++= (mappings in (coreMacros, Compile, packageBin)).value, - mappings in (Compile, packageSrc) ++= (mappings in (coreMacros, Compile, packageSrc)).value, - mappings in (Compile, packageBin) ++= (mappings in (chiselFrontend, Compile, packageBin)).value, - mappings in (Compile, packageSrc) ++= (mappings in (chiselFrontend, Compile, packageSrc)).value, - // Export the packaged JAR so projects that depend directly on Chisel project (rather than the - // published artifact) also see the stuff in coreMacros and chiselFrontend. - exportJars := true + ) ) |