1 files changed, 28 insertions, 6 deletions
diff --git a/build.sbt b/build.sbt
index 16f8e19f..1dbd0abf 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,15 +6,23 @@ site.includeScaladoc()
 
 ghpages.settings
 
+import UnidocKeys._
+
+lazy val customUnidocSettings = unidocSettings ++ Seq (
+  doc in Compile := (doc in ScalaUnidoc).value,
+  target in unidoc in ScalaUnidoc := crossTarget.value / "api"
+)
+
 lazy val commonSettings = Seq (
+  organization := "edu.berkeley.cs",
+  version := "3.1-SNAPSHOT",
+  git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
+  autoAPIMappings := true,
   scalaVersion := "2.11.7"
 )
 
 lazy val chiselSettings = Seq (
-  organization := "edu.berkeley.cs",
-  version := "3.0",
   name := "Chisel3",
-  git.remoteRepo := "git@github.com:ucb-bar/chisel3.git",
 
   publishMavenStyle := true,
   publishArtifact in Test := false,
@@ -79,17 +87,31 @@ lazy val chiselSettings = Seq (
   //  }
 )
 
-lazy val chiselFrontend = (project in file("chiselFrontend")).
+lazy val coreMacros = (project in file("coreMacros")).
   settings(commonSettings: _*).
   settings(
     libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
   )
 
+lazy val chiselFrontend = (project in file("chiselFrontend")).
+  settings(commonSettings: _*).
+  settings(
+    libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
+  ).
+  dependsOn(coreMacros)
+
 lazy val chisel = (project in file(".")).
   settings(commonSettings: _*).
+  settings(customUnidocSettings: _*).
   settings(chiselSettings: _*).
-  dependsOn(chiselFrontend).settings(
+  dependsOn(coreMacros).
+  dependsOn(chiselFrontend).
+  settings(
+    aggregate in doc := false,
     // 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)
-  )
+  ).
+  aggregate(coreMacros, chiselFrontend)