diff options
| author | David Biancolin | 2019-01-22 17:40:36 -0500 |
|---|---|---|
| committer | GitHub | 2019-01-22 17:40:36 -0500 |
| commit | bbd6eafe8943dc5dc2d44e5e67ac4c9dd96594bb (patch) | |
| tree | 8423d9d1b496de8d380d0d0d5fda8a8a6564fa09 | |
| parent | 10586d6a141859b843057ec9979011e26ad207f1 (diff) | |
| parent | 1d566b66bfd1b8809b2b605552343dc665dfd3c9 (diff) | |
Merge branch 'master' into top-wiring-aggregates
| -rw-r--r-- | build.sbt | 11 | ||||
| -rw-r--r-- | project/plugins.sbt | 2 | ||||
| -rw-r--r-- | src/LICENSE.txt | 2 |
3 files changed, 7 insertions, 8 deletions
@@ -4,10 +4,6 @@ enablePlugins(SiteScaladocPlugin) -enablePlugins(GhpagesPlugin) - -git.remoteRepo := "git@github.com:freechipsproject/firrtl.git" - // Firrtl code organization := "edu.berkeley.cs" @@ -109,7 +105,8 @@ javaSource in Antlr4 := (sourceManaged in Compile).value publishMavenStyle := true publishArtifact in Test := false pomIncludeRepository := { x => false } -// Don't add 'scm' elements if we have a git.remoteRepo definition. +// Don't add 'scm' elements if we have a git.remoteRepo definition, +// but since we don't (with the removal of ghpages), add them in below. pomExtra := <url>http://chisel.eecs.berkeley.edu/</url> <licenses> <license> @@ -118,6 +115,10 @@ pomExtra := <url>http://chisel.eecs.berkeley.edu/</url> <distribution>repo</distribution> </license> </licenses> + <scm> + <url>https://github.com/freechipsproject/firrtl.git</url> + <connection>scm:git:github.com/freechipsproject/firrtl.git</connection> + </scm> <developers> <developer> <id>jackbackrack</id> diff --git a/project/plugins.sbt b/project/plugins.sbt index 1a7cb8a6..6baf83c6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,8 +4,6 @@ resolvers += Classpaths.sbtPluginReleases resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") - addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") diff --git a/src/LICENSE.txt b/src/LICENSE.txt index ad3748f7..89fd3d00 100644 --- a/src/LICENSE.txt +++ b/src/LICENSE.txt @@ -1,6 +1,6 @@ FIRRTL licence terms -Copyright (c) 2014 - 2016 The Regents of the University of +Copyright (c) 2014 - 2019 The Regents of the University of California (Regents). All Rights Reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: |