From b2e004fb615a3c931d910a338b9faa99c1c975d7 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Sun, 22 Mar 2020 18:11:25 -0700
Subject: Remove compile-internal from build.sbt

This has the effect of causing the coreMacros and chiselFrontend
projects to be published separately
---
 build.sbt | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

(limited to 'build.sbt')

diff --git a/build.sbt b/build.sbt
index be265361..d943ecfc 100644
--- a/build.sbt
+++ b/build.sbt
@@ -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
+    )
   )
-- 
cgit v1.2.3


From fbf5e6f1a0e8bf535d465b748ad554575fe62156 Mon Sep 17 00:00:00 2001
From: Jack Koenig
Date: Sun, 22 Mar 2020 18:13:58 -0700
Subject: Rename subprojects to more canonical names

* Rename coreMacros to macros
* Rename chiselFrontend to core

Also make each subproject publish with "chisel3-" as a prefix
---
 build.sbt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'build.sbt')

diff --git a/build.sbt b/build.sbt
index d943ecfc..64520fa1 100644
--- a/build.sbt
+++ b/build.sbt
@@ -122,12 +122,14 @@ lazy val chiselSettings = Seq (
   }
 )
 
-lazy val coreMacros = (project in file("coreMacros")).
+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: _*).
   settings(
+    name := "chisel3-core",
     scalacOptions := scalacOptions.value ++ Seq(
       "-deprecation",
       "-explaintypes",
@@ -139,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("."))
@@ -155,9 +157,9 @@ lazy val chisel = (project in file(".")).
   settings(commonSettings: _*).
   settings(chiselSettings: _*).
   settings(publishSettings: _*).
-  dependsOn(coreMacros).
-  dependsOn(chiselFrontend).
-  aggregate(coreMacros, chiselFrontend).
+  dependsOn(macros).
+  dependsOn(core).
+  aggregate(macros, core).
   settings(
     scalacOptions in Test ++= Seq("-language:reflectiveCalls"),
     scalacOptions in Compile in doc ++= Seq(
-- 
cgit v1.2.3