chipsalliance · jackkoenig · Mar 26, 2020 · Mar 23, 2020 · Mar 23, 2020
diff --git 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
+    )
   )
diff --git a/...nd/src/main/scala/chisel3/Aggregate.scala → core/src/main/scala/chisel3/Aggregate.scala b/...nd/src/main/scala/chisel3/Aggregate.scala → core/src/main/scala/chisel3/Aggregate.scala
diff --git a/...d/src/main/scala/chisel3/Annotation.scala → core/src/main/scala/chisel3/Annotation.scala b/...d/src/main/scala/chisel3/Annotation.scala → core/src/main/scala/chisel3/Annotation.scala
diff --git a/...ntend/src/main/scala/chisel3/Assert.scala → core/src/main/scala/chisel3/Assert.scala b/...ntend/src/main/scala/chisel3/Assert.scala → core/src/main/scala/chisel3/Assert.scala
diff --git a/...ntend/src/main/scala/chisel3/Attach.scala → core/src/main/scala/chisel3/Attach.scala b/...ntend/src/main/scala/chisel3/Attach.scala → core/src/main/scala/chisel3/Attach.scala
diff --git a/...rontend/src/main/scala/chisel3/Bits.scala → core/src/main/scala/chisel3/Bits.scala b/...rontend/src/main/scala/chisel3/Bits.scala → core/src/main/scala/chisel3/Bits.scala
diff --git a/...end/src/main/scala/chisel3/BlackBox.scala → core/src/main/scala/chisel3/BlackBox.scala b/...end/src/main/scala/chisel3/BlackBox.scala → core/src/main/scala/chisel3/BlackBox.scala
diff --git a/.../src/main/scala/chisel3/BoolFactory.scala → .../src/main/scala/chisel3/BoolFactory.scala b/.../src/main/scala/chisel3/BoolFactory.scala → .../src/main/scala/chisel3/BoolFactory.scala
diff --git a/...ontend/src/main/scala/chisel3/Clock.scala → core/src/main/scala/chisel3/Clock.scala b/...ontend/src/main/scala/chisel3/Clock.scala → core/src/main/scala/chisel3/Clock.scala
diff --git a/...c/main/scala/chisel3/CompileOptions.scala → ...c/main/scala/chisel3/CompileOptions.scala b/...c/main/scala/chisel3/CompileOptions.scala → ...c/main/scala/chisel3/CompileOptions.scala
diff --git a/...rontend/src/main/scala/chisel3/Data.scala → core/src/main/scala/chisel3/Data.scala b/...rontend/src/main/scala/chisel3/Data.scala → core/src/main/scala/chisel3/Data.scala
diff --git a/...tend/src/main/scala/chisel3/Element.scala → core/src/main/scala/chisel3/Element.scala b/...tend/src/main/scala/chisel3/Element.scala → core/src/main/scala/chisel3/Element.scala
diff --git a/...Frontend/src/main/scala/chisel3/Mem.scala → core/src/main/scala/chisel3/Mem.scala b/...Frontend/src/main/scala/chisel3/Mem.scala → core/src/main/scala/chisel3/Mem.scala
diff --git a/...ntend/src/main/scala/chisel3/Module.scala → core/src/main/scala/chisel3/Module.scala b/...ntend/src/main/scala/chisel3/Module.scala → core/src/main/scala/chisel3/Module.scala
diff --git a/...src/main/scala/chisel3/ModuleAspect.scala → ...src/main/scala/chisel3/ModuleAspect.scala b/...src/main/scala/chisel3/ModuleAspect.scala → ...src/main/scala/chisel3/ModuleAspect.scala
diff --git a/...d/src/main/scala/chisel3/MultiClock.scala → core/src/main/scala/chisel3/MultiClock.scala b/...d/src/main/scala/chisel3/MultiClock.scala → core/src/main/scala/chisel3/MultiClock.scala
diff --git a/...Frontend/src/main/scala/chisel3/Mux.scala → core/src/main/scala/chisel3/Mux.scala b/...Frontend/src/main/scala/chisel3/Mux.scala → core/src/main/scala/chisel3/Mux.scala
diff --git a/...Frontend/src/main/scala/chisel3/Num.scala → core/src/main/scala/chisel3/Num.scala b/...Frontend/src/main/scala/chisel3/Num.scala → core/src/main/scala/chisel3/Num.scala
diff --git a/...nd/src/main/scala/chisel3/Printable.scala → core/src/main/scala/chisel3/Printable.scala b/...nd/src/main/scala/chisel3/Printable.scala → core/src/main/scala/chisel3/Printable.scala
diff --git a/...ntend/src/main/scala/chisel3/Printf.scala → core/src/main/scala/chisel3/Printf.scala b/...ntend/src/main/scala/chisel3/Printf.scala → core/src/main/scala/chisel3/Printf.scala
diff --git a/...nd/src/main/scala/chisel3/RawModule.scala → core/src/main/scala/chisel3/RawModule.scala b/...nd/src/main/scala/chisel3/RawModule.scala → core/src/main/scala/chisel3/RawModule.scala
diff --git a/...Frontend/src/main/scala/chisel3/Reg.scala → core/src/main/scala/chisel3/Reg.scala b/...Frontend/src/main/scala/chisel3/Reg.scala → core/src/main/scala/chisel3/Reg.scala
diff --git a/.../src/main/scala/chisel3/SIntFactory.scala → .../src/main/scala/chisel3/SIntFactory.scala b/.../src/main/scala/chisel3/SIntFactory.scala → .../src/main/scala/chisel3/SIntFactory.scala
diff --git a/...end/src/main/scala/chisel3/SeqUtils.scala → core/src/main/scala/chisel3/SeqUtils.scala b/...end/src/main/scala/chisel3/SeqUtils.scala → core/src/main/scala/chisel3/SeqUtils.scala
diff --git a/...d/src/main/scala/chisel3/StrongEnum.scala → core/src/main/scala/chisel3/StrongEnum.scala b/...d/src/main/scala/chisel3/StrongEnum.scala → core/src/main/scala/chisel3/StrongEnum.scala
diff --git a/.../src/main/scala/chisel3/UIntFactory.scala → .../src/main/scala/chisel3/UIntFactory.scala b/.../src/main/scala/chisel3/UIntFactory.scala → .../src/main/scala/chisel3/UIntFactory.scala
diff --git a/...rontend/src/main/scala/chisel3/When.scala → core/src/main/scala/chisel3/When.scala b/...rontend/src/main/scala/chisel3/When.scala → core/src/main/scala/chisel3/When.scala
diff --git a/...d/src/main/scala/chisel3/aop/Aspect.scala → core/src/main/scala/chisel3/aop/Aspect.scala b/...d/src/main/scala/chisel3/aop/Aspect.scala → core/src/main/scala/chisel3/aop/Aspect.scala
diff --git a/...src/main/scala/chisel3/core/package.scala → ...src/main/scala/chisel3/core/package.scala b/...src/main/scala/chisel3/core/package.scala → ...src/main/scala/chisel3/core/package.scala
diff --git a/...nd/src/main/scala/chisel3/dontTouch.scala → core/src/main/scala/chisel3/dontTouch.scala b/...nd/src/main/scala/chisel3/dontTouch.scala → core/src/main/scala/chisel3/dontTouch.scala
diff --git a/...n/scala/chisel3/experimental/Analog.scala → ...n/scala/chisel3/experimental/Analog.scala b/...n/scala/chisel3/experimental/Analog.scala → ...n/scala/chisel3/experimental/Analog.scala
diff --git a/.../scala/chisel3/experimental/package.scala → .../scala/chisel3/experimental/package.scala b/.../scala/chisel3/experimental/package.scala → .../scala/chisel3/experimental/package.scala
diff --git a/...in/scala/chisel3/internal/BiConnect.scala → ...in/scala/chisel3/internal/BiConnect.scala b/...in/scala/chisel3/internal/BiConnect.scala → ...in/scala/chisel3/internal/BiConnect.scala
diff --git a/...main/scala/chisel3/internal/Binding.scala → ...main/scala/chisel3/internal/Binding.scala b/...main/scala/chisel3/internal/Binding.scala → ...main/scala/chisel3/internal/Binding.scala
diff --git a/...main/scala/chisel3/internal/Builder.scala → ...main/scala/chisel3/internal/Builder.scala b/...main/scala/chisel3/internal/Builder.scala → ...main/scala/chisel3/internal/Builder.scala
diff --git a/...c/main/scala/chisel3/internal/Error.scala → ...c/main/scala/chisel3/internal/Error.scala b/...c/main/scala/chisel3/internal/Error.scala → ...c/main/scala/chisel3/internal/Error.scala
diff --git a/.../scala/chisel3/internal/MonoConnect.scala → .../scala/chisel3/internal/MonoConnect.scala b/.../scala/chisel3/internal/MonoConnect.scala → .../scala/chisel3/internal/MonoConnect.scala
diff --git a/...c/main/scala/chisel3/internal/Namer.scala → ...c/main/scala/chisel3/internal/Namer.scala b/...c/main/scala/chisel3/internal/Namer.scala → ...c/main/scala/chisel3/internal/Namer.scala
diff --git a/...n/scala/chisel3/internal/SourceInfo.scala → ...n/scala/chisel3/internal/SourceInfo.scala b/...n/scala/chisel3/internal/SourceInfo.scala → ...n/scala/chisel3/internal/SourceInfo.scala
diff --git a/...a/chisel3/internal/firrtl/Converter.scala → ...a/chisel3/internal/firrtl/Converter.scala b/...a/chisel3/internal/firrtl/Converter.scala → ...a/chisel3/internal/firrtl/Converter.scala
diff --git a/...in/scala/chisel3/internal/firrtl/IR.scala → ...in/scala/chisel3/internal/firrtl/IR.scala b/...in/scala/chisel3/internal/firrtl/IR.scala → ...in/scala/chisel3/internal/firrtl/IR.scala
diff --git a/...tend/src/main/scala/chisel3/package.scala → core/src/main/scala/chisel3/package.scala b/...tend/src/main/scala/chisel3/package.scala → core/src/main/scala/chisel3/package.scala
diff --git a/...rc/main/scala/chisel3/SourceInfoDoc.scala → ...rc/main/scala/chisel3/SourceInfoDoc.scala b/...rc/main/scala/chisel3/SourceInfoDoc.scala → ...rc/main/scala/chisel3/SourceInfoDoc.scala
diff --git a/...ala/chisel3/internal/RangeTransform.scala → ...ala/chisel3/internal/RangeTransform.scala b/...ala/chisel3/internal/RangeTransform.scala → ...ala/chisel3/internal/RangeTransform.scala
diff --git a/...nternal/RuntimeDeprecationTransform.scala → ...nternal/RuntimeDeprecationTransform.scala b/...nternal/RuntimeDeprecationTransform.scala → ...nternal/RuntimeDeprecationTransform.scala
diff --git a/...3/internal/naming/NamingAnnotations.scala → ...3/internal/naming/NamingAnnotations.scala b/...3/internal/naming/NamingAnnotations.scala → ...3/internal/naming/NamingAnnotations.scala
diff --git a/...rnal/sourceinfo/SourceInfoTransform.scala → ...rnal/sourceinfo/SourceInfoTransform.scala b/...rnal/sourceinfo/SourceInfoTransform.scala → ...rnal/sourceinfo/SourceInfoTransform.scala