Skip to content

Commit 94d36b4

Browse files
authored
Merge pull request #10158 from dotty-staging/s3d-fix-testcase-doc-gen
Scala3doc: ensure testcases are compiled before documenting them
2 parents 141d804 + 8ac1e45 commit 94d36b4

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

project/Build.scala

+5-2
Original file line numberDiff line numberDiff line change
@@ -1463,6 +1463,9 @@ object Build {
14631463
run.in(Compile).toTask(s""" -d output/$outDir -t $targets -n "$name" -s $sourceMapping $params""")
14641464
}
14651465

1466+
def joinProducts(products: Seq[java.io.File]): String =
1467+
products.iterator.map(_.getAbsolutePath.toString).mkString(java.io.File.pathSeparator)
1468+
14661469
project.settings(commonBootstrappedSettings).
14671470
dependsOn(`scala3-compiler-bootstrapped`).
14681471
dependsOn(`scala3-tasty-inspector`).
@@ -1481,7 +1484,7 @@ object Build {
14811484
"com.novocode" % "junit-interface" % "0.11" % "test",
14821485
),
14831486
Test / test := (Test / test).dependsOn(compile.in(Compile).in(`scala3doc-testcases`)).value,
1484-
testcasesOutputDir.in(Test) := classDirectory.in(Compile).in(`scala3doc-testcases`).value.getAbsolutePath.toString,
1487+
testcasesOutputDir.in(Test) := joinProducts((`scala3doc-testcases`/Compile/products).value),
14851488
testcasesSourceRoot.in(Test) := (baseDirectory.in(`scala3doc-testcases`).value / "src").getAbsolutePath.toString,
14861489
Compile / mainClass := Some("dotty.dokka.Main"),
14871490
// There is a bug in dokka that prevents parallel tests withing the same jvm
@@ -1498,7 +1501,7 @@ object Build {
14981501
// (`stdlib-bootstrapped`/Compile/products).value,
14991502
).flatten
15001503

1501-
val roots = dottyJars.map(_.toString).mkString(java.io.File.pathSeparator)
1504+
val roots = joinProducts(dottyJars)
15021505

15031506
if (dottyJars.isEmpty) Def.task { streams.value.log.error("Dotty lib wasn't found") }
15041507
else generateDocumentation(roots, "Scala 3", "stdLib", "-p dotty-docs/docs")

0 commit comments

Comments
 (0)