Merge pull request #1384 from freechipsproject/no-more-compile-internal

No more compile internal

1 files changed, 10 insertions, 26 deletions

diff --git a/build.sbt b/build.sbt
index be265361..64520fa1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -122,16 +122,14 @@ 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)
+lazy val macros = (project in file("macros")).
+  settings(name := "chisel3-macros").
+  settings(commonSettings: _*)
 
-lazy val chiselFrontend = (project in file("chiselFrontend")).
+lazy val core = (project in file("core")).
   settings(commonSettings: _*).
-  // Prevent separate JARs from being generated for chiselFrontend.
-  settings(skip in publish := true).
   settings(
+    name := "chisel3-core",
     scalacOptions := scalacOptions.value ++ Seq(
       "-deprecation",
       "-explaintypes",
@@ -143,7 +141,7 @@ lazy val chiselFrontend = (project in file("chiselFrontend")).
 //      "-Xlint:missing-interpolator"
     )
   ).
-  dependsOn(coreMacros)
+  dependsOn(macros)
 
 // This will always be the root project, even if we are a sub-project.
 lazy val root = RootProject(file("."))
@@ -159,15 +157,9 @@ 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.
-  aggregate(coreMacros, chiselFrontend).
+  dependsOn(macros).
+  dependsOn(core).
+  aggregate(macros, core).
   settings(
     scalacOptions in Test ++= Seq("-language:reflectiveCalls"),
     scalacOptions in Compile in doc ++= Seq(
@@ -189,13 +181,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
+    )
   )