restructure macros for better submoduling

build.sbt

@@ -2,31 +2,33 @@
 
 import Dependencies._
 
-lazy val commonSettings = Seq(
-  organization := "edu.berkeley.cs",
-  version := "0.1-SNAPSHOT",
-  scalaVersion := "2.11.8",
-  scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls"),
-  libraryDependencies ++= commonDependencies
-)
-
 val defaultVersions = Map(
   "chisel3" -> "3.1-SNAPSHOT",
   "chisel-iotesters" -> "1.2-SNAPSHOT"
 )
 
-lazy val mdf = RootProject(file("mdf/scalalib"))
+lazy val commonSettings = Seq(
+  organization := "edu.berkeley.cs",
+  version := "0.1-SNAPSHOT",
+  scalaVersion := "2.11.8",
+  scalacOptions := Seq("-deprecation", "-feature", "-language:reflectiveCalls"),
+  libraryDependencies ++= commonDependencies,
+  libraryDependencies ++= Seq("chisel3","chisel-iotesters").map {
+    dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep))
+  },
+  resolvers ++= Seq(
+    Resolver.sonatypeRepo("snapshots"),
+    Resolver.sonatypeRepo("releases")
+  )
+)
 
-lazy val tapeout = (project in file("tapeout"))
+lazy val mdf = (project in file("mdf/scalalib"))
+lazy val macros = (project in file("macros"))
   .dependsOn(mdf)
   .settings(commonSettings)
-  .settings(
+
-    libraryDependencies ++= Seq("chisel3","chisel-iotesters").map {
+lazy val tapeout = (project in file("tapeout"))
-      dep: String => "edu.berkeley.cs" %% dep % sys.props.getOrElse(dep + "Version", defaultVersions(dep))
+  .settings(commonSettings)
-    },
-    resolvers ++= Seq(
-      Resolver.sonatypeRepo("snapshots"),
-      Resolver.sonatypeRepo("releases")
-    )
-  )
   .settings(scalacOptions in Test ++= Seq("-language:reflectiveCalls"))
+
+lazy val root = (project in file(".")).aggregate(macros, tapeout)

macros/src/main/scala/MacroCompiler.scala

@@ -1,6 +1,6 @@
 // See LICENSE for license details.
 
-package barstools.tapeout.transforms.macros
+package barstools.macros
 
 import firrtl._
 import firrtl.ir._

macros/src/main/scala/SynFlops.scala

@@ -1,6 +1,6 @@
 // See LICENSE for license details.
 
-package barstools.tapeout.transforms.macros
+package barstools.macros
 
 import firrtl._
 import firrtl.ir._

macros/src/main/scala/Utils.scala

@@ -1,6 +1,6 @@
 // See LICENSE for license details.
 
-package barstools.tapeout.transforms.macros
+package barstools.macros
 
 import firrtl._
 import firrtl.ir._

macros/src/test/scala/MacroCompilerSpec.scala

@@ -1,6 +1,5 @@
-package barstools.tapeout.transforms.macros.test
+package barstools.macros
 
-import barstools.tapeout.transforms.macros._
 import firrtl.ir.{Circuit, NoInfo}
 import firrtl.passes.RemoveEmpty
 import firrtl.Parser.parse

macros/src/test/scala/SimpleSplitDepth.scala

@@ -1,4 +1,4 @@
-package barstools.tapeout.transforms.macros.test
+package barstools.macros
 
 import firrtl.Utils.ceilLog2
 import mdf.macrolib._

macros/src/test/scala/SimpleSplitWidth.scala

@@ -1,4 +1,4 @@
-//~ package barstools.tapeout.transforms.macros.test
+//~ package barstools.macros
 
 //~ import java.io.File