Skip to content

Commit 7edebcf

Browse files
committed
Make the scala-scala library a submodule.
1 parent a447c5b commit 7edebcf

File tree

4 files changed

+10
-8
lines changed

4 files changed

+10
-8
lines changed

.gitignore

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,6 @@ tests/partest-generated/
3737
tests/locks/
3838
/test-classes/
3939

40-
# Used in tests
41-
scala-scala
42-
4340
# Ignore output files but keep the directory
4441
out/
4542
build/

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,7 @@
22
path = scala-backend
33
url = https://github.com/lampepfl/scala.git
44
branch = sharing-backend
5+
[submodule "scala-scala"]
6+
path = scala-scala
7+
url = https://github.com/lampepfl/scala.git
8+
branch = dotty-library

project/Build.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -901,12 +901,12 @@ object DottyInjectedPlugin extends AutoPlugin {
901901
}
902902

903903
private def projectChecks(): Unit = {
904-
val scalaScala = new File("scala-scala")
905-
if (!scalaScala.exists()) {
904+
val submodules = List(new File("scala-backend"), new File("scala-scala"))
905+
if (!submodules.forall(_.exists)) {
906906
println(
907-
s"""[WARNING] Missing `dotty/scala-scala` library
908-
|You can clone the library with:
909-
| > git clone -b dotty-library https://github.com/DarkDimius/scala.git ${scalaScala.getAbsolutePath}
907+
s"""[WARNING] Missing some of the submodules
908+
|You can initialize the modules with:
909+
| > git submodule update --init
910910
""".stripMargin)
911911
}
912912
}

scala-scala

Submodule scala-scala added at 7ecfce1

0 commit comments

Comments
 (0)