From ffe58abac5f60d785b684bb249aee0153bddea3f Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Mon, 19 Sep 2016 15:27:52 -0700
Subject: Add sbt-buildinfo support.

---
 src/main/scala/chisel3/Driver.scala | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/Driver.scala b/src/main/scala/chisel3/Driver.scala
index 5e0a3a0f..2216bbbd 100644
--- a/src/main/scala/chisel3/Driver.scala
+++ b/src/main/scala/chisel3/Driver.scala
@@ -7,6 +7,7 @@ import java.io._
 
 import internal._
 import internal.firrtl._
+import BuildInfo._
 
 trait BackendCompilationUtilities {
   /** Create a temporary directory with the prefix name. Exists here because it doesn't in Java 6.
@@ -132,4 +133,7 @@ object Driver extends BackendCompilationUtilities {
   }
 
   def targetDir(): String = { target_dir getOrElse new File(".").getCanonicalPath }
+
+  val version = BuildInfo.version
+  val chiselVersionString = BuildInfo.toString
 }
-- 
cgit v1.2.3


From f98171296f821034cf66ace070bcf179183e833d Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Wed, 5 Oct 2016 09:25:07 -0700
Subject: Print Chisel version when Driver object is created.

---
 src/main/scala/chisel3/Driver.scala | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/Driver.scala b/src/main/scala/chisel3/Driver.scala
index 2216bbbd..e91b40b4 100644
--- a/src/main/scala/chisel3/Driver.scala
+++ b/src/main/scala/chisel3/Driver.scala
@@ -136,4 +136,5 @@ object Driver extends BackendCompilationUtilities {
 
   val version = BuildInfo.version
   val chiselVersionString = BuildInfo.toString
+  println(chiselVersionString)
 }
-- 
cgit v1.2.3


From 39e3d05dfcd05bb278e08543be3bbc9204e690ca Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 6 Oct 2016 13:30:31 -0700
Subject: Remove non-standard sbt-buildinfo settings; write buildinfo to firrtl
 file.

---
 src/main/scala/chisel3/Driver.scala                  | 1 -
 src/main/scala/chisel3/internal/firrtl/Emitter.scala | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/main')

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
 }
-- 
cgit v1.2.3


From 5b8c8fbb169c9e0635bbd7274232390049e7c894 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 6 Oct 2016 16:42:10 -0700
Subject: Breakup the initial emitted string per @ducky64.

---
 src/main/scala/chisel3/internal/firrtl/Emitter.scala | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/internal/firrtl/Emitter.scala b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
index a559ddc5..9c766ec3 100644
--- a/src/main/scala/chisel3/internal/firrtl/Emitter.scala
+++ b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
@@ -102,7 +102,9 @@ 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";${Driver.chiselVersionString}\ncircuit ${circuit.name} : ")
+  private val res = new StringBuilder()
+  res ++= s";${Driver.chiselVersionString}\n"
+  res ++= "circuit ${circuit.name} : "
   withIndent { circuit.components.foreach(c => res ++= emit(c)) }
   res ++= newline
 }
-- 
cgit v1.2.3


From b9e2a664de7cd35ab5cd176350bafed435dc10e9 Mon Sep 17 00:00:00 2001
From: Jim Lawson
Date: Thu, 6 Oct 2016 16:55:42 -0700
Subject: Fix typo in emitted string.

---
 src/main/scala/chisel3/internal/firrtl/Emitter.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main')

diff --git a/src/main/scala/chisel3/internal/firrtl/Emitter.scala b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
index 9c766ec3..e0daa95c 100644
--- a/src/main/scala/chisel3/internal/firrtl/Emitter.scala
+++ b/src/main/scala/chisel3/internal/firrtl/Emitter.scala
@@ -104,7 +104,7 @@ private class Emitter(circuit: Circuit) {
 
   private val res = new StringBuilder()
   res ++= s";${Driver.chiselVersionString}\n"
-  res ++= "circuit ${circuit.name} : "
+  res ++= s"circuit ${circuit.name} : "
   withIndent { circuit.components.foreach(c => res ++= emit(c)) }
   res ++= newline
 }
-- 
cgit v1.2.3