diff options
| -rw-r--r-- | Makefile | 15 | ||||
| -rw-r--r-- | build.sbt | 56 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 12 |
4 files changed, 53 insertions, 32 deletions
@@ -25,15 +25,15 @@ c_resources_dir := src/main/resources test_outs := $(addprefix $(targetDir)/, $(addsuffix .out, $(test_results))) -.PHONY: smoke publish-local check clean jenkins-build coverage scaladoc test checkstyle compile +.PHONY: smoke publish-local pubishLocal check clean jenkins-build coverage scaladoc test checkstyle compile -default: publish-local +default: publishLocal smoke compile: $(SBT) $(SBT_FLAGS) compile -publish-local: - $(SBT) $(SBT_FLAGS) publish-local +publish-local publishLocal: + $(SBT) $(SBT_FLAGS) publishLocal test: $(SBT) $(SBT_FLAGS) test @@ -69,7 +69,7 @@ site: # We need to run the coverage tests last, since Jenkins will fail the build if it can't find their results. jenkins-build: clean $(SBT) $(SBT_FLAGS) test - $(SBT) $(SBT_FLAGS) clean publish-local + $(SBT) $(SBT_FLAGS) clean publishLocal $(SBT) $(SBT_FLAGS) scalastyle coverage test $(SBT) $(SBT_FLAGS) coverageReport @@ -87,3 +87,8 @@ $(targetDir)/%.h: $(c_resources_dir)/%.h $(targetDir)/%.out: $(targetDir)/% $(SBT) $(SBT_FLAGS) "test:runMain ChiselTests.MiniChisel $(notdir $(basename $<)) $(CHISEL_FLAGS) --test --targetDir $(targetDir)" + +# The "last-resort" rule. +# We assume the target is something like "+clean". +%:: + $(SBT) $(SBT_FLAGS) $@ @@ -1,27 +1,45 @@ // See LICENSE for license details. -site.settings - -site.includeScaladoc() - -ghpages.settings - -import UnidocKeys._ - -lazy val customUnidocSettings = unidocSettings ++ Seq ( - doc in Compile := (doc in ScalaUnidoc).value, - target in unidoc in ScalaUnidoc := crossTarget.value / "api" -) +enablePlugins(SiteScaladocPlugin) + +enablePlugins(GhpagesPlugin) + +def scalacOptionsVersion(scalaVersion: String): Seq[String] = { + Seq() ++ { + // If we're building with Scala > 2.11, enable the compile option + // switch to support our anonymous Bundle definitions: + // https://github.com/scala/bug/issues/10047 + CrossVersion.partialVersion(scalaVersion) match { + case Some((2, scalaMajor: Int)) if scalaMajor < 12 => Seq() + case _ => Seq("-Xsource:2.11") + } + } +} + +def javacOptionsVersion(scalaVersion: String): Seq[String] = { + Seq() ++ { + // Scala 2.12 requires Java 8. We continue to generate + // Java 7 compatible code for Scala 2.11 + // for compatibility with old clients. + CrossVersion.partialVersion(scalaVersion) match { + case Some((2, scalaMajor: Int)) if scalaMajor < 12 => + Seq("-source", "1.7", "-target", "1.7") + case _ => + Seq("-source", "1.8", "-target", "1.8") + } + } +} val defaultVersions = Map("firrtl" -> "1.1-SNAPSHOT") lazy val commonSettings = Seq ( organization := "edu.berkeley.cs", version := "3.1-SNAPSHOT", - git.remoteRepo := "git@github.com:ucb-bar/chisel3.git", + git.remoteRepo := "git@github.com:freechipsproject/chisel3.git", autoAPIMappings := true, scalaVersion := "2.11.11", - scalacOptions := Seq("-deprecation", "-feature"), + crossScalaVersions := Seq("2.11.11", "2.12.3"), + 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), // Use the root project's unmanaged base for all sub-projects. @@ -54,8 +72,8 @@ lazy val chiselSettings = Seq ( </license> </licenses> <scm> - <url>https://github.com/ucb-bar/chisel3.git</url> - <connection>scm:git:github.com/ucb-bar/chisel3.git</connection> + <url>https://github.com/freechipsproject/chisel3.git</url> + <connection>scm:git:github.com/freechipsproject/chisel3.git</connection> </scm> <developers> <developer> @@ -84,13 +102,13 @@ lazy val chiselSettings = Seq ( libraryDependencies ++= Seq( "org.scalatest" %% "scalatest" % "3.0.1" % "test", "org.scalacheck" %% "scalacheck" % "1.13.4" % "test", - "com.github.scopt" %% "scopt" % "3.5.0" + "com.github.scopt" %% "scopt" % "3.6.0" ), // Tests from other projects may still run concurrently. parallelExecution in Test := true, - javacOptions ++= Seq("-target", "1.7") + javacOptions ++= javacOptionsVersion(scalaVersion.value) ) lazy val coreMacros = (project in file("coreMacros")). @@ -107,6 +125,7 @@ lazy val root = RootProject(file(".")) lazy val chisel = (project in file(".")). enablePlugins(BuildInfoPlugin). + enablePlugins(ScalaUnidocPlugin). settings( buildInfoPackage := name.value, buildInfoOptions += BuildInfoOption.BuildTime, @@ -114,7 +133,6 @@ lazy val chisel = (project in file(".")). buildInfoKeys := Seq[BuildInfoKey](buildInfoPackage, version, scalaVersion, sbtVersion) ). settings(commonSettings: _*). - settings(customUnidocSettings: _*). settings(chiselSettings: _*). // Prevent separate JARs from being generated for coreMacros and chiselFrontend. dependsOn(coreMacros % "compile-internal;test-internal"). diff --git a/project/build.properties b/project/build.properties index 64317fda..c091b86c 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.15 +sbt.version=0.13.16 diff --git a/project/plugins.sbt b/project/plugins.sbt index 6703eda9..aaf7bc26 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -4,17 +4,15 @@ resolvers += Classpaths.sbtPluginReleases resolvers += "jgit-repo" at "http://download.eclipse.org/jgit/maven" -addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") - -addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "0.8.0") +addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.5.4") +addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "0.8.2") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.0") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.6.1") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0") -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1") |