Split stdlib-bootstrapped into stdlib-full-bootstrapped and stdlib-bootstrapped

nicolasstucki · nicolasstucki · commit eaa372d310e5 · 2023-05-17T08:35:55.000+02:00
The first only contains the files form the Scala 2 stdlib, the second
also contains the files from the Scala 3 stdlib.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -134,7 +134,7 @@ jobs:
 
       - name: Cmd Tests
         run: |
-          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
+          ./project/scripts/sbt ";dist/pack; scala3-bootstrapped/compile; scala3-bootstrapped/test ;sbt-test/scripted scala2-compat/* ;stdlib-bootstrapped/test:run ;stdlib-full-bootstrapped/test:run ;stdlib-bootstrapped-tasty-tests/test; scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
           ./project/scripts/cmdTests
           ./project/scripts/bootstrappedOnlyCmdTests
 
@@ -253,7 +253,7 @@ jobs:
 
       - name: MiMa
         run: |
-          ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues"
+          ./project/scripts/sbt ";scala3-interfaces/mimaReportBinaryIssues ;scala3-library-bootstrapped/mimaReportBinaryIssues ;scala3-library-bootstrappedJS/mimaReportBinaryIssues; tasty-core-bootstrapped/mimaReportBinaryIssues; stdlib-bootstrapped/mimaReportBinaryIssues; stdlib-full-bootstrapped/mimaReportBinaryIssues"
 
   community_build_a:
     runs-on: [self-hosted, Linux]
diff --git a/build.sbt b/build.sbt
@@ -15,6 +15,7 @@ val `scala3-bench` = Build.`scala3-bench`
 val `scala3-bench-bootstrapped` = Build.`scala3-bench-bootstrapped`
 val `scala3-bench-micro` = Build.`scala3-bench-micro`
 val `stdlib-bootstrapped` = Build.`stdlib-bootstrapped`
+val `stdlib-full-bootstrapped` = Build.`stdlib-full-bootstrapped`
 val `stdlib-bootstrapped-tasty-tests` = Build.`stdlib-bootstrapped-tasty-tests`
 val `tasty-core` = Build.`tasty-core`
 val `tasty-core-bootstrapped` = Build.`tasty-core-bootstrapped`
diff --git a/project/Build.scala b/project/Build.scala
@@ -926,50 +926,78 @@ object Build {
   lazy val `stdlib-bootstrapped` = project.in(file("stdlib-bootstrapped")).
     withCommonSettings(Bootstrapped).
     dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
-    settings(commonBootstrappedSettings).
+    settings(stdliBootstrappedCommonSettings).
     settings(
-      moduleName := "scala-library",
-      javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
       Compile/scalacOptions ++= {
         Seq(
           "-sourcepath",
           Seq(
             baseDirectory.value / "stdlib-bootstrapped" / "src",
             (Compile/sourceManaged).value / "scala-library-src",
-            (Compile/sourceManaged).value / "dotty-library-src",
           ).mkString(File.pathSeparator),
         )
       },
-      Compile / doc / scalacOptions += "-Ydocument-synthetic-types",
-      scalacOptions -= "-Xfatal-warnings",
-      ivyConfigurations += SourceDeps.hide,
-      transitiveClassifiers := Seq("sources"),
-      libraryDependencies +=
-        ("org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped) % "sourcedeps"),
-      (Compile / sourceGenerators) += Def.task {
-        val s = streams.value
-        val cacheDir = s.cacheDirectory
-        val trgDir = (Compile / sourceManaged).value / "scala-library-src"
-
-        val report = updateClassifiers.value
-        val scalaLibrarySourcesJar = report.select(
-            configuration = configurationFilter("sourcedeps"),
-            module = (_: ModuleID).name == "scala-library",
-            artifact = artifactFilter(`type` = "src")).headOption.getOrElse {
-          sys.error(s"Could not fetch scala-library sources")
+      run := {
+        val args: Seq[String] = spaceDelimited("<arg>").parsed
+        val reference = (Compile/sourceManaged).value / "scala-library-src"
+        args match {
+          case Seq("list") =>
+            println(s"List of non-overriden files in $reference")
+            reference.allPaths.get()
+              .flatMap(_.relativeTo(reference))
+              .filter(_.ext == "scala")
+              .sorted
+              .foreach(println)
+          case Seq(cmd @ ("clone" | "overwrite"), files*) =>
+            println("Cloning scala-library sources: " + files.mkString(", "))
+            for (file <- files) {
+              val referenceStdlibPaths = reference / file
+              val destination = baseDirectory.value / "src" / file
+              if (!referenceStdlibPaths.exists) {
+                println("Not found " + referenceStdlibPaths)
+              } else if (destination.exists && cmd == "clone") {
+                println(s"Already exists $file. (use `overwrite` command to overwrite)")
+              } else {
+                val action = if (cmd == "clone") "Cloning" else "Overwriting"
+                println(s"$action $file")
+                IO.copyFile(referenceStdlibPaths, destination)
+              }
+            }
+          case _ =>
+            println(
+              """Usage:
+                |> stdlib-bootstrapped/run list
+                |  -- lists all files that are not overriden in stdlib-bootstrapped/src
+                |
+                |> stdlib-bootstrapped/run clone <sources>*
+                |  -- clones the specified sources from the stdlib-bootstrapped/src
+                |  -- example: stdlib-bootstrapped/run clone scala/Option.scala
+                |
+                |> stdlib-bootstrapped/run overwrite <sources>*
+                |  -- (danger) overwrites the specified sources from the stdlib-bootstrapped/src
+                |""".stripMargin)
         }
+      }
+    )
 
-        FileFunction.cached(cacheDir / s"fetchScalaLibrarySrc",
-            FilesInfo.lastModified, FilesInfo.exists) { dependencies =>
-          s.log.info(s"Unpacking scala-library sources to $trgDir...")
-          if (trgDir.exists)
-            IO.delete(trgDir)
-          IO.createDirectory(trgDir)
-          IO.unzip(scalaLibrarySourcesJar, trgDir)
-
-          ((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
-        } (Set(scalaLibrarySourcesJar)).toSeq
-      }.taskValue,
+  /** Scala library compiled by dotty using the latest published sources of the library
+   *  and the current Scala 3 livrary sources
+   */
+  lazy val `stdlib-full-bootstrapped` = project.in(file("stdlib-full-bootstrapped")).
+    withCommonSettings(Bootstrapped).
+    dependsOn(dottyCompiler(Bootstrapped) % "provided; compile->runtime; test->test").
+    settings(stdliBootstrappedCommonSettings).
+    settings(
+     Compile/scalacOptions ++= {
+        Seq(
+          "-sourcepath",
+          Seq(
+            baseDirectory.value / "stdlib-bootstrapped" / "src",
+            (Compile/sourceManaged).value / "scala-library-src",
+            (Compile/sourceManaged).value / "dotty-library-src",
+          ).mkString(File.pathSeparator),
+        )
+      },
       (Compile / sourceGenerators) += Def.task {
         val s = streams.value
         val cacheDir = s.cacheDirectory
@@ -1000,6 +1028,43 @@ object Build {
 
         cachedFun(dottyLibSources.get.toSet).toSeq
       }.taskValue,
+    )
+
+  lazy val stdliBootstrappedCommonSettings =
+    commonBootstrappedSettings ++
+    Seq(
+      moduleName := "scala-library",
+      javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
+      Compile / doc / scalacOptions += "-Ydocument-synthetic-types",
+      scalacOptions -= "-Xfatal-warnings",
+      ivyConfigurations += SourceDeps.hide,
+      transitiveClassifiers := Seq("sources"),
+      libraryDependencies +=
+        ("org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped) % "sourcedeps"),
+      (Compile / sourceGenerators) += Def.task {
+        val s = streams.value
+        val cacheDir = s.cacheDirectory
+        val trgDir = (Compile / sourceManaged).value / "scala-library-src"
+
+        val report = updateClassifiers.value
+        val scalaLibrarySourcesJar = report.select(
+            configuration = configurationFilter("sourcedeps"),
+            module = (_: ModuleID).name == "scala-library",
+            artifact = artifactFilter(`type` = "src")).headOption.getOrElse {
+          sys.error(s"Could not fetch scala-library sources")
+        }
+
+        FileFunction.cached(cacheDir / s"fetchScalaLibrarySrc",
+            FilesInfo.lastModified, FilesInfo.exists) { dependencies =>
+          s.log.info(s"Unpacking scala-library sources to $trgDir...")
+          if (trgDir.exists)
+            IO.delete(trgDir)
+          IO.createDirectory(trgDir)
+          IO.unzip(scalaLibrarySourcesJar, trgDir)
+
+          ((trgDir ** "*.scala") +++ (trgDir ** "*.java")).get.toSet
+        } (Set(scalaLibrarySourcesJar)).toSeq
+      }.taskValue,
       (Compile / sources) ~= (_.filterNot(file =>
         // sources from https://github.com/scala/scala/tree/2.13.x/src/library-aux
         file.getPath.endsWith("scala-library-src/scala/Any.scala") ||
@@ -1020,56 +1085,15 @@ object Build {
       (Test / managedClasspath) ~= {
         _.filterNot(file => file.data.getName == s"scala-library-${stdlibVersion(Bootstrapped)}.jar")
       },
+      mimaCheckDirection := "backward",
       mimaPreviousArtifacts +=
         ("org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped)),
-      mimaCheckDirection := "backward",
       mimaExcludeAnnotations ++= Seq(
         "scala.annotation.experimental",
         "scala.annotation.specialized",
         "scala.annotation.unspecialized",
-        ),
+      ),
       mimaBinaryIssueFilters ++= MiMaFilters.LibraryBootstrapped,
-      run := {
-        val args: Seq[String] = spaceDelimited("<arg>").parsed
-        val reference = (Compile/sourceManaged).value / "scala-library-src"
-        args match {
-          case Seq("list") =>
-            println(s"List of non-overriden files in $reference")
-            reference.allPaths.get()
-              .flatMap(_.relativeTo(reference))
-              .filter(_.ext == "scala")
-              .sorted
-              .foreach(println)
-          case Seq(cmd @ ("clone" | "overwrite"), files*) =>
-            println("Cloning scala-library sources: " + files.mkString(", "))
-            for (file <- files) {
-              val referenceStdlibPaths = reference / file
-              val destination = baseDirectory.value / "src" / file
-              if (!referenceStdlibPaths.exists) {
-                println("Not found " + referenceStdlibPaths)
-              } else if (destination.exists && cmd == "clone") {
-                println(s"Already exists $file. (use `overwrite` command to overwrite)")
-              } else {
-                val action = if (cmd == "clone") "Cloning" else "Overwriting"
-                println(s"$action $file")
-                IO.copyFile(referenceStdlibPaths, destination)
-              }
-            }
-          case _ =>
-            println(
-              """Usage:
-                |> stdlib-bootstrapped/run list
-                |  -- lists all files that are not overriden in stdlib-bootstrapped/src
-                |
-                |> stdlib-bootstrapped/run clone <sources>*
-                |  -- clones the specified sources from the stdlib-bootstrapped/src
-                |  -- example: stdlib-bootstrapped/run clone scala/Option.scala
-                |
-                |> stdlib-bootstrapped/run overwrite <sources>*
-                |  -- (danger) overwrites the specified sources from the stdlib-bootstrapped/src
-                |""".stripMargin)
-        }
-      }
     )
 
   /** Test the tasty generated by `stdlib-bootstrapped`
@@ -1087,7 +1111,7 @@ object Build {
     settings(commonBootstrappedSettings).
     settings(
       javaOptions := (`scala3-compiler-bootstrapped` / javaOptions).value,
-      javaOptions += "-Ddotty.scala.library=" + (`stdlib-bootstrapped` / Compile / packageBin).value.getAbsolutePath
+      javaOptions += "-Ddotty.scala.library=" + (`stdlib-full-bootstrapped` / Compile / packageBin).value.getAbsolutePath
     )
 
   lazy val `scala3-sbt-bridge` = project.in(file("sbt-bridge/src")).
diff --git a/stdlib-full-bootstrapped/README.md b/stdlib-full-bootstrapped/README.md
@@ -0,0 +1,13 @@
+## stdlib-full-bootstrapped
+
+This project compiles the Scala standard library using the Scala 3 compiler.
+It uses the sources Scala (2/3) standard library sources from `stdlib-bootstrapped/src`
+and the Scala 3 library form `library/src`. It fetches any missing Scala (2/3) sources
+from `org.scala-lang" % "scala-library" % stdlibVersion(Bootstrapped) % "sourcedeps`.
+This implies that files in `stdlib-bootstrapped/src` override files override the Scala (2/3)
+sources. Currently we can not override files from `library/src`.
+
+To clone or list non-overridden sources execute `stdlib-bootstrapped/run`.
+
+This project generates a version of the Scala 3 library that contains the full library with
+TASTy files. The compiled library is located in `out/bootstrap/stdlib-full-bootstrapped/`.
diff --git a/stdlib-full-bootstrapped/test/Main.scala b/stdlib-full-bootstrapped/test/Main.scala
@@ -0,0 +1,12 @@
+package hello
+
+enum Color:
+  case Red, Green, Blue
+
+object HelloWorld:
+  def main(args: Array[String]): Unit = {
+    println("hello dotty.superbootstrapped!")
+    println(Color.Red)
+    println(Color.Green)
+    println(Color.Blue)
+  }
