Improve doc builds in community-build and fix tests

romanowski · romanowski · commit c829e9720465 · 2020-12-02T10:15:39.000+01:00
diff --git a/community-build/src/scala/dotty/communitybuild/Main.scala b/community-build/src/scala/dotty/communitybuild/Main.scala
@@ -53,13 +53,14 @@ object Main:
         val (failed, withDocs) = paths.partition{ case (_, paths) => paths.isEmpty }
 
         val indexFile = withDocs.map { case (name, paths) =>
-          paths.map(p => s"""<a href="$name/$p">$p</a></br>\n""")
+          paths.map(p => s"""<a href="$name/$p/index.html">$p</a></br>\n""")
             .mkString(s"<h1>$name</h1>","\n", "\n")
         }.mkString("<html><body>\n", "\n", "\n</html></body>")
 
         Files.write(dest.resolve("index.html"), indexFile.getBytes)
 
-        if ignored.nonEmpty then println(s"Ignored project without doc command: $ignored")
+        if ignored.nonEmpty then
+          println(s"Ignored project without doc command: ${ignored.map(_.project)}")
 
         if failed.nonEmpty then
           println(s"Documentation not found for ${failed.map(_._1).mkString(", ")}")
diff --git a/community-build/src/scala/dotty/communitybuild/projects.scala b/community-build/src/scala/dotty/communitybuild/projects.scala
@@ -143,7 +143,7 @@ object projects:
 
   private def forceDoc(projects: String*) =
     projects.map(project =>
-      s""";set $project/Compile/doc/sources ++= file("a.scala") +: ($project/Compile/doc/tastyFiles).value ;$project/doc"""
+      s""";set $project/Compile/doc/sources ++= ($project/Compile/doc/tastyFiles).value ;$project/doc"""
     ).mkString(" ")
 
   private def aggregateDoc(in: String)(projects: String*) =
diff --git a/project/Build.scala b/project/Build.scala
@@ -1302,6 +1302,7 @@ object Build {
         (publishLocal in `tasty-core-bootstrapped`).value
         (publishLocal in `scala3-library-bootstrapped`).value
         (publishLocal in `scala3-doc-bootstrapped`).value
+        (publishLocal in `scala3-tasty-inspector`).value
         (publishLocal in `scala3doc`).value
         (publishLocal in `scala3-compiler-bootstrapped`).value
         (publishLocal in `sbt-dotty`).value
@@ -1579,7 +1580,7 @@ object Build {
           Compile / buildInfoKeys := Seq[BuildInfoKey](version),
           Compile / buildInfoPackage := "dotty.dokka",
           testDocumentationRoot := (baseDirectory.value / "test-documentations").getAbsolutePath,
-          buildInfoPackage in Test := "dotty.dokka",
+          buildInfoPackage in Test := "dotty.dokka.test",
           BuildInfoPlugin.buildInfoScopedSettings(Test),
           BuildInfoPlugin.buildInfoScopedSettings(Compile),
           BuildInfoPlugin.buildInfoDefaultSettings,
diff --git a/scala3doc/test/dotty/dokka/SignatureTest.scala b/scala3doc/test/dotty/dokka/SignatureTest.scala
@@ -3,6 +3,7 @@ package dotty.dokka
 import scala.io.Source
 import scala.jdk.CollectionConverters._
 import scala.util.matching.Regex
+import dotty.dokka.test.BuildInfo
 
 import org.jetbrains.dokka.pages.{RootPageNode, PageNode, ContentPage, ContentText, ContentNode, ContentComposite}
 
diff --git a/scala3doc/test/dotty/dokka/site/SiteGeneratationTest.scala b/scala3doc/test/dotty/dokka/site/SiteGeneratationTest.scala
@@ -9,6 +9,7 @@ import org.junit.Assert._
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
 import java.nio.charset.Charset
+import dotty.dokka.test.BuildInfo
 
 class SiteGeneratationTest:
   val projectName = "Test Project Name"
diff --git a/scala3doc/test/dotty/dokka/tasty/util/TestUtils.scala b/scala3doc/test/dotty/dokka/tasty/util/TestUtils.scala
@@ -1,6 +1,6 @@
 package dotty.dokka.tasty.util
 
-import dotty.dokka.BuildInfo
+import dotty.dokka.test.BuildInfo
 
 object TestUtils {
   def listOurClasses(): List[String] = {
diff --git a/scala3doc/test/dotty/dokka/testUtils.scala b/scala3doc/test/dotty/dokka/testUtils.scala
@@ -4,9 +4,11 @@ import dotty.tools.dotc.core.Contexts._
 import dotty.tools.dotc.reporting.Diagnostic
 import dotty.tools.dotc.reporting.ConsoleReporter
 import dotty.tools.dotc.interfaces.Diagnostic.{ERROR, INFO, WARNING}
+import dotty.dokka.test.BuildInfo
 import org.junit.Assert._
 import java.io.File
 
+
 case class ReportedDiagnostics(errors: List[Diagnostic], warnings: List[Diagnostic], infos: List[Diagnostic]):
   def errorMsgs = errors.map(_.msg.rawMessage)
   def warningMsgs = warnings.map(_.msg.rawMessage)
