Skip to content

Commit

Permalink
Fix typos in Build.scala (#18689)
Browse files Browse the repository at this point in the history
  • Loading branch information
nicolasstucki authored Oct 13, 2023
2 parents 231ca72 + 9e6d1b2 commit 8c1cdc2
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ object Build {
"-classpath" :: classpath :: beforeCp ::: fromCp.drop(2)
}

lazy val nonBootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
lazy val nonBootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
// packageAll packages all and then returns a map with the abs location
packageAll := Def.taskDyn { // Use a dynamic task to avoid loops when loading the settings
Def.task {
Expand All @@ -843,7 +843,7 @@ object Build {
(Test / javaOptions) += "-Xss2m"
)

lazy val bootstrapedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
lazy val bootstrappedDottyCompilerSettings = commonDottyCompilerSettings ++ Seq(
javaOptions ++= {
val jars = packageAll.value
Seq(
Expand All @@ -866,7 +866,7 @@ object Build {
)

def dottyCompilerSettings(implicit mode: Mode): sbt.Def.SettingsDefinition =
if (mode == NonBootstrapped) nonBootstrapedDottyCompilerSettings else bootstrapedDottyCompilerSettings
if (mode == NonBootstrapped) nonBootstrappedDottyCompilerSettings else bootstrappedDottyCompilerSettings

lazy val `scala3-compiler` = project.in(file("compiler")).asDottyCompiler(NonBootstrapped)

Expand Down Expand Up @@ -1036,10 +1036,10 @@ object Build {
}),
(Compile / sources) := {
val files = (Compile / sources).value
val overwritenSourcesDir = (Compile / scalaSource).value
val overwritenSources = files.flatMap(_.relativeTo(overwritenSourcesDir)).toSet
val overwrittenSourcesDir = (Compile / scalaSource).value
val overwrittenSources = files.flatMap(_.relativeTo(overwrittenSourcesDir)).toSet
val reference = (Compile/sourceManaged).value / "scala-library-src"
files.filterNot(_.relativeTo(reference).exists(overwritenSources))
files.filterNot(_.relativeTo(reference).exists(overwrittenSources))
},
(Test / managedClasspath) ~= {
_.filterNot(file => file.data.getName == s"scala-library-$stdlibBootstrappedVersion.jar")
Expand All @@ -1066,11 +1066,11 @@ object Build {
val minorVersion = previousDottyVersion.split('.')(1)
// TODO find a way around this and test in the CI
streams.value.log.warn(
s"""To allow TASTy-MiMa to read TASTy files generated by this vesion of the compile you must:
s"""To allow TASTy-MiMa to read TASTy files generated by this version of the compile you must:
| * Modify the TASTy version to the latest stable release (latest version supported by TASTy-MiMa) in in tasty/src/dotty/tools/tasty/TastyFormat.scala
| - final val MinorVersion = $minorVersion
| - final val ExperimentalVersion = 0
| * Clean everiting to generate a compiler with those new TASTy vesrions
| * Clean everything to generate a compiler with those new TASTy versions
| * Run scala2-library-bootstrapped/tastyMiMaReportIssues
|""".stripMargin)

Expand Down Expand Up @@ -1144,7 +1144,7 @@ object Build {
* The sources in src are compiled using TASTy from scala2-library-tasty but then run
* with the scala-library compiled be Scala 2.
*
* The tests are run with the bootstrapped compiler and the tasty inpector on the classpath.
* The tests are run with the bootstrapped compiler and the tasty inspector on the classpath.
* The classpath has the default `scala-library` and not `scala2-library-bootstrapped`.
*
* The jar of `scala2-library-bootstrapped` is provided for to the tests.
Expand Down Expand Up @@ -1557,14 +1557,14 @@ object Build {
.asDottyBench(Bootstrapped)
.settings(Jmh / run / mainClass := Some("org.openjdk.jmh.Main"))

val testcasesOutputDir = taskKey[Seq[String]]("Root directory where tests classses are generated")
val testcasesOutputDir = taskKey[Seq[String]]("Root directory where tests classes are generated")
val testcasesSourceRoot = taskKey[String]("Root directory where tests sources are generated")
val testDocumentationRoot = taskKey[String]("Root directory where tests documentation are stored")
val generateSelfDocumentation = taskKey[Unit]("Generate example documentation")
// Note: the two tasks below should be one, but a bug in Tasty prevents that
val generateScalaDocumentation = inputKey[Unit]("Generate documentation for dotty lib")
val generateStableScala3Documentation = inputKey[Unit]("Generate documentation for stable dotty lib")
val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, usefull for debugging tests")
val generateTestcasesDocumentation = taskKey[Unit]("Generate documentation for testcases, useful for debugging tests")

val generateReferenceDocumentation = inputKey[Unit]("Generate language reference documentation for Scala 3")

Expand Down

0 comments on commit 8c1cdc2

Please sign in to comment.