Skip to content

Prepare dotty-library for bootstrap #5520

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.

Sign up for GitHub

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

Merged
nicolasstucki merged 1 commit into from
Dec 3, 2018
Merged

Prepare dotty-library for bootstrap #5520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compiler/test/dotty/tools/dotc/CompilationTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ class CompilationTests extends ParallelTesting {
Array("-Ycheck-reentrant", "-Yemit-tasty-in-class")
)

val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-scala3"))
val libraryDirs = List(Paths.get("library/src"), Paths.get("library/src-bootstrapped"))
val librarySources = libraryDirs.flatMap(d => sources(Files.walk(d)))

val lib =
Expand Down
0 library/src-scala3/scala/StagedTuple.scala → .../src-bootstrapped/scala/StagedTuple.scala
View file
Open in desktop
File renamed without changes.
0 library/src-scala3/scala/Tuple.scala → library/src-bootstrapped/scala/Tuple.scala
View file
Open in desktop
File renamed without changes.
0 ...ary/src-scala3/scala/quoted/package.scala → ...c-bootstrapped/scala/quoted/package.scala
View file
Open in desktop
File renamed without changes.
0 .../src-scala3/scala/typelevel/package.scala → ...ootstrapped/scala/typelevel/package.scala
View file
Open in desktop
File renamed without changes.
0 library/src-scala2/scala/Tuple.scala → ...ry/src-non-bootstrapped/scala/Tuple.scala
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions project/Build.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -775,14 +775,14 @@ object Build {
lazy val dottyLibrarySettings = Seq(
libraryDependencies += "org.scala-lang" % "scala-library" % scalacVersion,
// Add version-specific source directories:
// - files in src-scala3 will only be compiled by dotty
// - files in src-scala2 will only be compiled by scalac
// - files in src-non-bootstrapped will only be compiled by the reference compiler (scalac)
// - files in src-bootstrapped will only be compiled by the current dotty compiler (non-bootstrapped and bootstrapped)
unmanagedSourceDirectories in Compile += {
val baseDir = baseDirectory.value
if (isDotty.value)
baseDir / "src-scala3"
baseDir / "src-bootstrapped"
else
baseDir / "src-scala2"
baseDir / "src-non-bootstrapped"
}
)

Expand Down