From 859094d292dbfa55e098d615bac7c508fada7a67 Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Thu, 19 May 2016 16:57:30 -0700 Subject: Update to current sbt resolver idiom. --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 06a73d88..16f8e19f 100644 --- a/build.sbt +++ b/build.sbt @@ -50,8 +50,8 @@ lazy val chiselSettings = Seq ( }, resolvers ++= Seq( - "Sonatype Snapshots" at "http://oss.sonatype.org/content/repositories/snapshots", - "Sonatype Releases" at "http://oss.sonatype.org/content/repositories/releases" + Resolver.sonatypeRepo("snapshots"), + Resolver.sonatypeRepo("releases") ), /* Bumping "com.novocode" % "junit-interface" % "0.11", causes DelayTest testSeqReadBundle to fail -- cgit v1.2.3 From 510edad0f7446b4a422c4dfd070054dd25f44233 Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Tue, 27 Sep 2016 09:32:09 -0700 Subject: Use "chisel3" as sbt project name. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 02a0e9f5..de4ad539 100644 --- a/build.sbt +++ b/build.sbt @@ -14,7 +14,7 @@ lazy val commonSettings = Seq ( ) lazy val chiselSettings = Seq ( - name := "Chisel3", + name := "chisel3", publishMavenStyle := true, publishArtifact in Test := false, -- cgit v1.2.3 From c68f1fd9fa27f93bae24bc14575f2d535d10594c Mon Sep 17 00:00:00 2001 From: Jim Lawson Date: Wed, 28 Sep 2016 14:48:15 -0700 Subject: Generate scaladoc for all subprojects. Use aggregate to run project tasks in subprojects Use sbt-unidoc to generate combined scaladoc for project and subprojects. --- build.sbt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'build.sbt') diff --git a/build.sbt b/build.sbt index 02a0e9f5..5c8461ba 100644 --- a/build.sbt +++ b/build.sbt @@ -6,10 +6,18 @@ 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" +) + lazy val commonSettings = Seq ( organization := "edu.berkeley.cs", version := "3.1-SNAPSHOT", git.remoteRepo := "git@github.com:ucb-bar/chisel3.git", + autoAPIMappings := true, scalaVersion := "2.11.7" ) @@ -94,18 +102,16 @@ lazy val chiselFrontend = (project in file("chiselFrontend")). lazy val chisel = (project in file(".")). settings(commonSettings: _*). + settings(customUnidocSettings: _*). settings(chiselSettings: _*). dependsOn(coreMacros). dependsOn(chiselFrontend). settings( + aggregate in doc := false, // Include macro classes, resources, and sources main jar. mappings in (Compile, packageBin) <++= mappings in (coreMacros, Compile, packageBin), mappings in (Compile, packageSrc) <++= mappings in (coreMacros, Compile, packageSrc), mappings in (Compile, packageBin) <++= mappings in (chiselFrontend, Compile, packageBin), mappings in (Compile, packageSrc) <++= mappings in (chiselFrontend, Compile, packageSrc) - ) - -// This is ugly. There must be a better way. -publish <<= (publish) dependsOn (publish in coreMacros, publish in chiselFrontend) - -publishLocal <<= (publishLocal) dependsOn (publishLocal in coreMacros, publishLocal in chiselFrontend) + ). + aggregate(coreMacros, chiselFrontend) -- cgit v1.2.3