Fix hardcoded scala version in cmdScaladocTests

deniszo · Aug 23, 2021 · 6ad7540 · 6ad7540
1 parent b0fb854
commit 6ad7540
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests
@@ -10,8 +10,11 @@ clear_out "$OUT1"
 STDLIB_COMMAND="$SBT \"eval println(Build.stdlibVersion(Modes.NonBootstrapped))\""
 STDLIB_VERSION=$(eval $STDLIB_COMMAND | tail -n 2 | head -n 1)
 
-DOTTY_NONBOOTSTRAPPED_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\""
-DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_COMMAND | tail -n 2 | head -n 1)
+DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyNonBootstrappedVersion)\""
+DOTTY_NONBOOTSTRAPPED_VERSION=$(eval $DOTTY_NONBOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
+
+DOTTY_BOOTSTRAPPED_VERSION_COMMAND="$SBT \"eval println(Build.dottyVersion)\""
+DOTTY_BOOTSTRAPPED_VERSION=$(eval $DOTTY_BOOTSTRAPPED_VERSION_COMMAND | tail -n 2 | head -n 1)
 
 "$SBT" "scaladoc/generateTestcasesDocumentation" > "$tmp" 2>&1 || echo "generated testcases project with sbt"
 dist/target/pack/bin/scaladoc \
@@ -29,6 +32,6 @@ dist/target/pack/bin/scaladoc \
   "-skip-by-id:scala.runtime.stdLibPatches" \
   "-skip-by-id:scala.runtime.MatchCase" \
   -project-footer "Copyright (c) 2002-2021, LAMP/EPFL" \
-  -author -groups -revision master -project-version 3.0.2-RC1-bin-SNAPSHOT \
-  out/bootstrap/scaladoc-testcases/scala-3.0.2-RC1-bin-SNAPSHOT-nonbootstrapped/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
+  -author -groups -revision master -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \
+  out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts"
 diff -rq "$OUT1" "scaladoc/output/testcases"