Remove non-standard sbt-buildinfo settings; write buildinfo to firrtl file.

4 files changed, 2 insertions, 28 deletions

diff --git a/build.sbt b/build.sbt
index f4aae4aa..09bf75ba 100644
--- a/build.sbt
+++ b/build.sbt
@@ -106,19 +106,7 @@ lazy val chisel = (project in file(".")).
     // We should really be using name.value, but currently, the package is "Chisel" (uppercase first letter)
     buildInfoPackage := /* name.value */ "chisel3",
     buildInfoOptions += BuildInfoOption.BuildTime,
-    buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion),
-    // Move the managed source directory where git won't complain about it,
-    //  and where we can easily package its files as part of the source jar artifact.
-    //  We'd like to use versionToArray(), slice(), and mkString() to convert an explicit
-    //  Scala version (like 2.10.6), into the leftmost two components (2.10),
-    //  but this seems to run afoul of assumptions sbt makes about the inclusion
-    //  of Scala-version-specfic code (we get
-    //    BuildInfo is already defined as case class BuildInfo
-    //  so use the full version spec.
-    //sourceManaged in Compile <<= (sourceDirectory in Compile, scalaVersion){ (s,v) => s / ("scala-" + versionToArray(v).slice(0,2).mkString(".") + "/src_managed") },
-    sourceManaged in Compile <<= (sourceDirectory in Compile, scalaVersion){ (s,v) => s / ("scala-" + v + "/src_managed") },
-    // Add the generated sources to the packagedSrc artifact since they are excluded by default.
-    mappings in (Compile, packageSrc) += { ((sourceManaged in Compile).value / "sbt-buildinfo" / "BuildInfo.scala") -> "BuildInfo.scala" }
+    buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion)
   ).
   settings(commonSettings: _*).
   settings(customUnidocSettings: _*).
diff --git a/src/main/scala/chisel3/Driver.scala b/src/main/scala/chisel3/Driver.scala
index 03f8547e..b0c7aeda 100644
--- a/src/main/scala/chisel3/Driver.scala
+++ b/src/main/scala/chisel3/Driver.scala
@@ -139,5 +139,4 @@ object Driver extends BackendCompilationUtilities {
 
   val version = BuildInfo.version
   val chiselVersionString = BuildInfo.toString
-  println(chiselVersionString)
 }
diff --git a/src/main/scala/chisel3/internal/firrtl/Emitter.scala b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
index f1908089..a559ddc5 100644
--- a/src/main/scala/chisel3/internal/firrtl/Emitter.scala
+++ b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
@@ -102,7 +102,7 @@ private class Emitter(circuit: Circuit) {
   private def unindent() { require(indentLevel > 0); indentLevel -= 1 }
   private def withIndent(f: => Unit) { indent(); f; unindent() }
 
-  private val res = new StringBuilder(s"circuit ${circuit.name} : ")
+  private val res = new StringBuilder(s";${Driver.chiselVersionString}\ncircuit ${circuit.name} : ")
   withIndent { circuit.components.foreach(c => res ++= emit(c)) }
   res ++= newline
 }
diff --git a/src/test/scala/chiselTests/BuildInfoTests.scala b/src/test/scala/chiselTests/BuildInfoTests.scala
deleted file mode 100644
index 21eae17c..00000000
--- a/src/test/scala/chiselTests/BuildInfoTests.scala
+++ /dev/null
@@ -1,13 +0,0 @@
-package chiselTests
-
-import org.scalatest.FlatSpec
-
-//import Chisel._
-
-class BuildInfoTests extends FlatSpec {
-  behavior of "BuildInfoTests"
-
-  it should "provide correct BuildInfo" in {
-    println(Chisel.Driver.chiselVersionString)
-  }
-}