Skip to content

Fix genDocs' classPath (build failure on master) #6528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 17, 2019
Merged

Fix genDocs' classPath (build failure on master) #6528

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fbac655
Fix genDocs classPath
OlivierBlanvillain May 17, 2019
56aa9be
Only generate the docs on master
OlivierBlanvillain May 17, 2019
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
16 changes: 7 additions & 9 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,8 @@ object Build {
val dottyLib = jars("dotty-library")
val dottyInterfaces = jars("dotty-interfaces")
val otherDeps = (dependencyClasspath in Compile).value.map(_.data).mkString(File.pathSeparator)
dottyLib + File.pathSeparator + dottyInterfaces + File.pathSeparator + otherDeps
val attList = (dependencyClasspath in Runtime).value
dottyLib + File.pathSeparator + findLib(attList, "scala-library-")
}

lazy val semanticdbSettings = Seq(
Expand All @@ -317,8 +318,7 @@ object Build {
)
)

// Settings shared between dotty-doc and dotty-doc-bootstrapped
lazy val dottyDocSettings = Seq(
def dottyDocSettings(implicit mode: Mode) = Seq(
baseDirectory in (Compile, run) := baseDirectory.value / "..",
baseDirectory in Test := baseDirectory.value / "..",

Expand All @@ -336,12 +336,10 @@ object Build {
val majorVersion = baseVersion.take(baseVersion.lastIndexOf('.'))
IO.write(file("./docs/_site/versions/latest-nightly-base"), majorVersion)

val sources =
unmanagedSources.in(Compile, compile).value ++
unmanagedSources.in(`dotty-compiler`, Compile).value ++
// TODO use bootstrapped library
// Blocked by #6295, also see https://github.com/lampepfl/dotty/pull/5499
unmanagedSources.in(`dotty-library`, Compile).value
val sources = unmanagedSources.in(mode match {
case NonBootstrapped => `dotty-library`
case Bootstrapped => `dotty-library-bootstrapped`
}, Compile).value
val args = Seq(
"-siteroot", "docs",
"-project", "Dotty",
Expand Down