Skip to content

Commit b2af166

Browse files
smarterfelixmulder
authored andcommitted
Super Bootstrap: Make dottydoc part of the bootstrap
This wasn't done before because dotty could not compile dottydoc, this is now fixed.
1 parent 8716fac commit b2af166

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

project/Build.scala

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,16 @@ object DottyBuild extends Build {
206206

207207
// Settings shared between dotty-compiler and dotty-compiler-bootstrapped
208208
lazy val dottyCompilerSettings = Seq(
209+
210+
// necessary evil: dottydoc currently needs to be included in the dotty
211+
// project, for sbt integration
212+
unmanagedResourceDirectories in Compile := Seq((resourceDirectory in Compile).value),
213+
unmanagedResourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "resources",
214+
unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value),
215+
unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "src",
216+
unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value),
217+
unmanagedSourceDirectories in Test += baseDirectory.value / ".." / "doc-tool" / "test",
218+
209219
// set system in/out for repl
210220
connectInput in run := true,
211221
outputStrategy := Some(StdoutOutput),
@@ -448,17 +458,6 @@ object DottyBuild extends Build {
448458
settings(
449459
overrideScalaVersionSetting,
450460

451-
// necessary evil: dottydoc currently needs to be included in the dotty
452-
// project, for sbt integration
453-
// FIXME: note part of dottyCompilerSettings because the doc-tool does not
454-
// compile with dotty
455-
unmanagedResourceDirectories in Compile := Seq((resourceDirectory in Compile).value),
456-
unmanagedResourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "resources",
457-
unmanagedSourceDirectories in Compile := Seq((scalaSource in Compile).value),
458-
unmanagedSourceDirectories in Compile += baseDirectory.value / ".." / "doc-tool" / "src",
459-
unmanagedSourceDirectories in Test := Seq((scalaSource in Test).value),
460-
unmanagedSourceDirectories in Test += baseDirectory.value / ".." / "doc-tool" / "test",
461-
462461
// Disable scaladoc generation, it's way too slow and we'll replace it
463462
// by dottydoc anyway. We still publish an empty -javadoc.jar to make
464463
// sonatype happy.

0 commit comments

Comments
 (0)