From 93dd0ed20858ad8e8ebfd73f283f98b4508be32a Mon Sep 17 00:00:00 2001 From: ducky Date: Wed, 23 Nov 2016 13:49:24 -0800 Subject: Fix for direct dependencies --- build.sbt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 939865d9..ba629250 100644 --- a/build.sbt +++ b/build.sbt @@ -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 ) -- cgit v1.2.3