Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,11 @@ object Build {
sources.in(Test) := Nil
)

def scalaDoc(implicit mode: Mode): Project = mode match {
case NonBootstrapped => `scaladoc-nonBootstrapped`
case Bootstrapped => scaladoc
}

lazy val `scaladoc-testcases` = project.in(file("scaladoc-testcases")).asScaladocTestcases

lazy val `scaladoc-js` = project.in(file("scaladoc-js")).asScaladocJs
Expand Down Expand Up @@ -1415,7 +1420,7 @@ object Build {

// FIXME: we do not aggregate `bin` because its tests delete jars, thus breaking other tests
def asDottyRoot(implicit mode: Mode): Project = project.withCommonSettings.
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, scaladoc, `scala3-sbt-bridge`).
aggregate(`scala3-interfaces`, dottyLibrary, dottyCompiler, tastyCore, `scaladoc-nonBootstrapped`, `scala3-sbt-bridge`).
bootstrappedAggregate(`scala3-language-server`, `scala3-staging`, `scala3-tasty-inspector`,
`scala3-library-bootstrappedJS`, scaladoc).
dependsOn(tastyCore).
Expand Down Expand Up @@ -1637,7 +1642,7 @@ object Build {
def asDist(implicit mode: Mode): Project = project.
enablePlugins(PackPlugin).
withCommonSettings.
dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scaladoc).
dependsOn(`scala3-interfaces`, dottyCompiler, dottyLibrary, tastyCore, `scala3-staging`, `scala3-tasty-inspector`, scalaDoc).
settings(commonDistSettings).
bootstrappedSettings(
target := baseDirectory.value / "target" // override setting in commonBootstrappedSettings
Expand Down