diff options
| author | Jim Lawson | 2016-11-23 13:57:31 -0800 |
|---|---|---|
| committer | GitHub | 2016-11-23 13:57:31 -0800 |
| commit | 08b4f68db403d6925fba8c9e943216ef8f38d69e (patch) | |
| tree | 303d7505853a41473c1794a43e19256222f044c4 | |
| parent | 6fa4a798560ec152451561ad00ef1fe1dd6db3ad (diff) | |
| parent | 93dd0ed20858ad8e8ebfd73f283f98b4508be32a (diff) | |
Merge pull request #384 from ucb-bar/jarfix
Fix for direct dependencies
| -rw-r--r-- | build.sbt | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 ) |
