Merge branch 'master' into release

# Conflicts:
#	build.sbt

Author: ucbjrl

README.md

@@ -1,3 +1,8 @@
+#### NOTE: This README.md describes (and associated repository contains) version 2.x of Chisel, and while we continue to support this version of Chisel, we encourage people to migrate to the new version: [Chisel3](https://github.com/ucb-bar/chisel3)
+
+We've removed the Getting Started section of this document.
+If you're just getting started, you should be using Chisel3.
+
 About Chisel
 ============
 
@@ -13,18 +18,10 @@ types, and type inference.
 Visit the [community website](http://chisel.eecs.berkeley.edu/) for more
 information.
 
-**NOTE**: This README.md describes (and associated repository contains)
-version 2.x of Chisel, and while we continue to support this version of
-Chisel, we encourage people to migrate to the new version:
-[Chisel3](https://github.com/ucb-bar/chisel3)
-
-We've removed the Getting Started section of this document.
-If you're just getting started, you should be using Chisel3.
-
 Documentation
 -------------
 
-Documentation has been moved to a separate [repo](https://github.com/ucb-bar/chisel-doc).
+Documentation has been moved to a separate [repository](https://github.com/ucb-bar/chisel-doc).
 
 
 Chisel3

build.sbt

@@ -2,11 +2,11 @@ def versionToArray(v: String): Array[String] = v.split('.')
 
 lazy val chiselBuildSettings = Seq (
     organization := "edu.berkeley.cs",
-    // version := "2.2.38",
-    version := "2.2.38",
+    // version := "2.2.39",
+    version := "2.2.39",
     name := "Chisel",
-    scalaVersion := "2.11.7",
-    crossScalaVersions := Seq("2.10.6", "2.11.7"),
+    scalaVersion := "2.11.11",
+    crossScalaVersions := Seq("2.10.6", "2.11.11"),
     //sourceDirectory := new File("@srcTop@"),
     publishMavenStyle := true,
     publishArtifact in Test := false,

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.11
+sbt.version=0.13.16

src/main/scala/Driver.scala

@@ -36,6 +36,13 @@ import sys.process.{BasicIO,stringSeqToProcess}
 import BuildInfo._
 
 object Driver extends FileSystemUtilities{
+  // Indicate this version of Chisel is deprecated and advise moving to chisel3.
+  val deprecatedWarning = new ChiselError(() => "Chisel2 is deprecated. Please use Chisel3: https://github.com/freechipsproject/chisel3", null, ChiselError.warningLevel)
+
+  def done: Unit = {
+    deprecatedWarning.print()
+  }
+
   def apply[T <: Module](args: Array[String], gen: () => T, wrapped:Boolean): T = {
     initChisel(args)
     try {
@@ -46,6 +53,7 @@ object Driver extends FileSystemUtilities{
         println("Re-running Chisel in debug mode to obtain erroneous line numbers...")
         apply(args :+ "--lineNumbers", gen, wrapped)
       }
+      done
     }
   }
 
@@ -69,6 +77,7 @@ object Driver extends FileSystemUtilities{
       } finally {
         Tester.close
       }
+      done
     }
     mod
   }

src/main/scala/testers/TesterDriver.scala

@@ -60,6 +60,7 @@ object TesterDriver {
         c.step(1)
         c.finish
       }
+      Driver.done
       true
     } catch {
       case e: Throwable =>