diff --git a/build.sbt b/build.sbt index 37b17953..f18110c7 100644 --- a/build.sbt +++ b/build.sbt @@ -22,6 +22,8 @@ lazy val commonSettings = Seq( ) ) +disablePlugins(sbtassembly.AssemblyPlugin) + lazy val mdf = (project in file("mdf/scalalib")) lazy val macros = (project in file("macros")) .dependsOn(mdf) @@ -29,8 +31,10 @@ lazy val macros = (project in file("macros")) .settings(Seq( libraryDependencies ++= Seq( "edu.berkeley.cs" %% "firrtl-interpreter" % "0.1-SNAPSHOT" % Test - ) + ), + mainClass := Some("barstools.macros.MacroCompiler") )) + .enablePlugins(sbtassembly.AssemblyPlugin) lazy val tapeout = (project in file("tapeout")) .settings(commonSettings) diff --git a/macros/build.sbt b/macros/build.sbt new file mode 100644 index 00000000..65e9704a --- /dev/null +++ b/macros/build.sbt @@ -0,0 +1 @@ +enablePlugins(sbtassembly.AssemblyPlugin) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 52c074b1..5c327ec4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,9 @@ object Dependencies { // Templating! val handlebarsVersion = "2.1.1" - val handlebars = "com.gilt" %% "handlebars-scala" % handlebarsVersion + val handlebars = "com.gilt" %% "handlebars-scala" % handlebarsVersion exclude("org.slf4j", "slf4j-simple") + // org.slf4j.slf4j-simple's StaticLoggerBinder (from handlebars) conflicts with + // ch.qos.logback.logback-classic's StaticLoggerBinder (from firrtl). val commonDependencies: Seq[ModuleID] = Seq( scalatest, @@ -17,4 +19,4 @@ object Dependencies { handlebars ) -} \ No newline at end of file +} diff --git a/project/assembly.sbt b/project/assembly.sbt new file mode 100644 index 00000000..8956d332 --- /dev/null +++ b/project/assembly.sbt @@ -0,0 +1,2 @@ +addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.5") +addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")