Skip to content
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.

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

remove dottydoc #11349

Merged
merged 11 commits into from
Feb 11, 2021
Merged

Conversation

romanowski
Copy link
Contributor

No description provided.

@romanowski romanowski changed the title Scaladoc/remote dottydoc remove dottydoc Feb 8, 2021
Copy link
Contributor

@liufengyun liufengyun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to remove dist/bin/scalad as well.

@michelou
Copy link
Collaborator

michelou commented Feb 9, 2021

We need to remove dist/bin/scalad as well.

Replaced by which command in the distro ?!

Note: scalad also appears in script file project/scripts/bootstrapCmdTests.

Copy link
Member

@smarter smarter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to remove dist/bin/scalad as well.

It should be replaced by a scaladoc binary which calls the new scaladoc

@@ -21,6 +20,7 @@ val `tasty-core` = Build.`tasty-core`
val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
val `tasty-core-scala2` = Build.`tasty-core-scala2`
val scaladoc = Build.scaladoc
val `scaladoc-nonBootstrapped` = Build.`scaladoc-nonBootstrapped`
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason to not make the nonbootstrapped the default one like for the other projects? Also if this stays in, this should be renamed to nonbootstrapped all lowercase to match scala3-tasty-inspector-nonbootstrapped above

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The *-bootstrapped projects are ones that we want to used in most cases so having a longer name there is a bit misleading. Also both scaladoc and tastyinspector are currently used in bootstrapped context so I didn't wanted to change all this places to scaladoc-bootstrapped

@@ -1230,6 +1159,10 @@ object Build {
val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
lazy val `scaladoc` = project.in(file("scaladoc")).asScaladoc
lazy val `scaladoc-nonBootstrapped` = project.in(file("scaladoc")).scaladocBasic(NonBootstrapped).settings(
sources.in(Test) := Nil
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can the tests not be run with the nonbootstrapped project for some reason? If so, that's worth explaining in a comment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will add a comment.

@romanowski romanowski marked this pull request as draft February 9, 2021 15:15
@romanowski
Copy link
Contributor Author

It should be replaced by a scaladoc binary which calls the new scaladoc

Yes, I will include that as well. TBH I should mark this PR as draft in first place, sorry.

@romanowski romanowski force-pushed the scaladoc/remote-dottydoc branch 2 times, most recently from bc6b18b to 51643d7 Compare February 10, 2021 19:29
@romanowski romanowski marked this pull request as ready for review February 10, 2021 21:15
Comment on lines 8 to 20
"$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala"
# The above is here as it relies on the bootstrapped library.
"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
"$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala"
# "$SBT" "scala3-bench/jmh:run 1 1 tests/pos/alias.scala"
# # The above is here as it relies on the bootstrapped library.
# "$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 tests/pos/alias.scala"
# "$SBT" "scala3-bench-bootstrapped/jmh:run 1 1 -with-compiler compiler/src/dotty/tools/dotc/core/Types.scala"

echo "testing scala.quoted.Expr.run from sbt scala"
"$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp"
grep -qe "val a: scala.Int = 3" "$tmp"
# echo "testing scala.quoted.Expr.run from sbt scala"
# "$SBT" ";scala3-compiler-bootstrapped/scalac -with-compiler tests/run-staging/quote-run.scala; scala3-compiler-bootstrapped/scala -with-compiler Test" > "$tmp"
# grep -qe "val a: scala.Int = 3" "$tmp"


# setup for `scalac`/`scala` script tests
"$SBT" dist/pack
# "$SBT" dist/pack

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did these tests get commented out?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Leftover from local debugging (benchmarks, even such small takes a while to run)

@anatoliykmetyuk anatoliykmetyuk merged commit e0e2263 into scala:master Feb 11, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants