Skip to content

Commit

Permalink
Merge pull request #384 from ucb-bar/jarfix
Browse files Browse the repository at this point in the history
Fix for direct dependencies
  • Loading branch information
ucbjrl committed Nov 23, 2016
2 parents 6fa4a79 + 93dd0ed commit 08b4f68
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,17 @@ lazy val chisel = (project in file(".")).
settings(commonSettings: _*).
settings(customUnidocSettings: _*).
settings(chiselSettings: _*).
// Prevent separate JARs from being generated for coreMacros and chiselFrontend.
dependsOn(coreMacros % "compile-internal;test-internal").
dependsOn(chiselFrontend % "compile-internal;test-internal").
settings(
aggregate in doc := false,
// Include macro classes, resources, and sources main jar.
// Include macro classes, resources, and sources main JAR.
mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin),
mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc),
mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin),
mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc)
mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc),
// 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
)

0 comments on commit 08b4f68

Please sign in to comment.