Merge branch '3.0.x' into 3.1.x

# Conflicts:
#	build.sbt
#	project/build.properties

Author: ucbjrl

build.sbt

@@ -39,6 +39,10 @@ lazy val commonSettings = Seq (
   autoAPIMappings := true,
   scalaVersion := "2.11.12",
   crossScalaVersions := Seq("2.11.12", "2.12.4"),
+  resolvers ++= Seq(
+    Resolver.sonatypeRepo("snapshots"),
+    Resolver.sonatypeRepo("releases")
+  ),
   scalacOptions := Seq("-deprecation", "-feature") ++ scalacOptionsVersion(scalaVersion.value),
   libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value,
   addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.0" cross CrossVersion.full),
@@ -57,12 +61,11 @@ lazy val commonSettings = Seq (
   }
 )
 
-lazy val chiselSettings = Seq (
-  name := "chisel3",
-
+lazy val publishSettings = Seq (
   publishMavenStyle := true,
   publishArtifact in Test := false,
   pomIncludeRepository := { x => false },
+  // Don't add 'scm' elements if we have a git.remoteRepo definition.
   pomExtra := <url>http://chisel.eecs.berkeley.edu/</url>
     <licenses>
       <license>
@@ -71,10 +74,6 @@ lazy val chiselSettings = Seq (
         <distribution>repo</distribution>
       </license>
     </licenses>
-    <scm>
-      <url>https://github.com/freechipsproject/chisel3.git</url>
-      <connection>scm:git:github.com/freechipsproject/chisel3.git</connection>
-    </scm>
     <developers>
       <developer>
         <id>jackbackrack</id>
@@ -92,12 +91,11 @@ lazy val chiselSettings = Seq (
     else {
       Some("releases" at nexus + "service/local/staging/deploy/maven2")
     }
-  },
+  }
+)
 
-  resolvers ++= Seq(
-    Resolver.sonatypeRepo("snapshots"),
-    Resolver.sonatypeRepo("releases")
-  ),
+lazy val chiselSettings = Seq (
+  name := "chisel3",
 
   libraryDependencies ++= Seq(
     "org.scalatest" %% "scalatest" % "3.0.1" % "test",
@@ -128,11 +126,13 @@ lazy val chisel = (project in file(".")).
   enablePlugins(ScalaUnidocPlugin).
   settings(
     buildInfoPackage := name.value,
+    buildInfoOptions += BuildInfoOption.BuildTime,
     buildInfoUsePackageAsPath := true,
     buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion)
   ).
   settings(commonSettings: _*).
   settings(chiselSettings: _*).
+  settings(publishSettings: _*).
   // Prevent separate JARs from being generated for coreMacros and chiselFrontend.
   dependsOn(coreMacros % "compile-internal;test-internal").
   dependsOn(chiselFrontend % "compile-internal;test-internal").
@@ -161,3 +161,7 @@ lazy val chisel = (project in file(".")).
     // published artifact) also see the stuff in coreMacros and chiselFrontend.
     exportJars := true
   )
+// We need the following for the release version that uses sbt to invoke firrtl.
+// sbt doesn't deal well with multiple simulataneous invocations for the same user
+
+  parallelExecution in Test := false