Fix name clashes on sbt subprojects and git submodules.

lavrov · May 4, 2017 · 5420a03 · 5420a03
1 parent 7575916
commit 5420a03
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 32 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,8 +2,8 @@
 	path = scala-backend
 	url = https://github.com/lampepfl/scala.git
 	branch = sharing-backend
-[submodule "scala-library"]
-	path = scala-library
+[submodule "scala2-library"]
+	path = scala2-library
 	url = https://github.com/lampepfl/scala.git
 	branch = dotty-library
 [submodule "collection-strawman"]

diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala
@@ -215,18 +215,18 @@ class tests extends CompilerTest {
 
   @Test def compileMixed = compileLine(
       """../tests/pos/B.scala
-        |../scala-library/src/library/scala/collection/immutable/Seq.scala
-        |../scala-library/src/library/scala/collection/parallel/ParSeq.scala
-        |../scala-library/src/library/scala/package.scala
-        |../scala-library/src/library/scala/collection/GenSeqLike.scala
-        |../scala-library/src/library/scala/collection/SeqLike.scala
-        |../scala-library/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
-  @Test def compileIndexedSeq = compileLine("../scala-library/src/library/scala/collection/immutable/IndexedSeq.scala")
-  @Test def compileParSetLike = compileLine("../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala")
+        |../scala2-library/src/library/scala/collection/immutable/Seq.scala
+        |../scala2-library/src/library/scala/collection/parallel/ParSeq.scala
+        |../scala2-library/src/library/scala/package.scala
+        |../scala2-library/src/library/scala/collection/GenSeqLike.scala
+        |../scala2-library/src/library/scala/collection/SeqLike.scala
+        |../scala2-library/src/library/scala/collection/generic/GenSeqFactory.scala""".stripMargin)
+  @Test def compileIndexedSeq = compileLine("../scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala")
+  @Test def compileParSetLike = compileLine("../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala")
   @Test def compileParSetSubset = compileLine(
-      """../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala
-        |../scala-library/src/library/scala/collection/parallel/mutable/ParSet.scala
-        |../scala-library/src/library/scala/collection/mutable/SetLike.scala""".stripMargin)(scala2mode ++ defaultOptions)
+      """../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala
+        |../scala2-library/src/library/scala/collection/parallel/mutable/ParSet.scala
+        |../scala2-library/src/library/scala/collection/mutable/SetLike.scala""".stripMargin)(scala2mode ++ defaultOptions)
 
   @Test def dottyBooted = {
     dottyBootedLib

diff --git a/compiler/test/dotty/tools/StdLibSources.scala b/compiler/test/dotty/tools/StdLibSources.scala
@@ -10,7 +10,7 @@ object StdLibSources {
   /* For debug only */
   private val useExplicitWhiteList = false
 
-  private final val stdLibPath = "../scala-library/src/library/"
+  private final val stdLibPath = "../scala2-library/src/library/"
 
   def blacklistFile: String = "../compiler/test/dotc/scala-collections.blacklist"
   private def whitelistFile: String = "../compiler/test/dotc/scala-collections.whitelist"

diff --git a/compiler/test/dotty/tools/dotc/CompilationTests.scala b/compiler/test/dotty/tools/dotc/CompilationTests.scala
@@ -50,24 +50,24 @@ class CompilationTests extends ParallelTesting {
       "compileMixed",
       List(
         "../tests/pos/B.scala",
-        "../scala-library/src/library/scala/collection/immutable/Seq.scala",
-        "../scala-library/src/library/scala/collection/parallel/ParSeq.scala",
-        "../scala-library/src/library/scala/package.scala",
-        "../scala-library/src/library/scala/collection/GenSeqLike.scala",
-        "../scala-library/src/library/scala/collection/SeqLike.scala",
-        "../scala-library/src/library/scala/collection/generic/GenSeqFactory.scala"
+        "../scala2-library/src/library/scala/collection/immutable/Seq.scala",
+        "../scala2-library/src/library/scala/collection/parallel/ParSeq.scala",
+        "../scala2-library/src/library/scala/package.scala",
+        "../scala2-library/src/library/scala/collection/GenSeqLike.scala",
+        "../scala2-library/src/library/scala/collection/SeqLike.scala",
+        "../scala2-library/src/library/scala/collection/generic/GenSeqFactory.scala"
       ),
       defaultOptions
     ) +
     compileFilesInDir("../tests/pos-special/spec-t5545", defaultOptions) +
-    compileFile("../scala-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
-    compileFile("../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
+    compileFile("../scala2-library/src/library/scala/collection/immutable/IndexedSeq.scala", defaultOptions) +
+    compileFile("../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala", defaultOptions) +
     compileList(
       "parSetSubset",
       List(
-       "../scala-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
-       "../scala-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
-       "../scala-library/src/library/scala/collection/mutable/SetLike.scala"
+       "../scala2-library/src/library/scala/collection/parallel/mutable/ParSetLike.scala",
+       "../scala2-library/src/library/scala/collection/parallel/mutable/ParSet.scala",
+       "../scala2-library/src/library/scala/collection/mutable/SetLike.scala"
       ),
       scala2Mode
     ) +

diff --git a/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala b/compiler/test/dotty/tools/dotc/parsing/ScannerTest.scala
@@ -60,6 +60,6 @@ class ScannerTest extends DottyTest {
 
   @Test
   def scanScala() = {
-    scanDir("../scala-library/src")
+    scanDir("../scala2-library/src")
   }
 }
diff --git a/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala b/compiler/test/dotty/tools/dotc/parsing/desugarPackage.scala
@@ -12,7 +12,7 @@ object desugarPackage extends DeSugarTest {
     val start = System.nanoTime()
     val startNodes = Trees.ntrees
     parseDir("./src")
-    parseDir("./scala-library/src")
+    parseDir("./scala2-library/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val nodes = Trees.ntrees
     val buf = parsedTrees map desugarTree

diff --git a/compiler/test/dotty/tools/dotc/parsing/parsePackage.scala b/compiler/test/dotty/tools/dotc/parsing/parsePackage.scala
@@ -68,7 +68,7 @@ object parsePackage extends ParserTest {
     nodes = 0
     val start = System.nanoTime()
     parseDir("./src")
-    parseDir("./scala-library/src")
+    parseDir("./scala2-library/src")
     val ms1 = (System.nanoTime() - start)/1000000
     val buf = parsedTrees map transformer.transform
     val ms2 = (System.nanoTime() - start)/1000000

diff --git a/doc-tool/test/UsecaseTest.scala b/doc-tool/test/UsecaseTest.scala
@@ -223,12 +223,12 @@ class UsecaseTest extends DottyDocTest {
   }
 
   @Test def checkIterator =
-    checkFiles("../scala-library/src/library/scala/collection/Iterator.scala" :: Nil) { _ =>
+    checkFiles("../scala2-library/src/library/scala/collection/Iterator.scala" :: Nil) { _ =>
       // success if typer throws no errors! :)
     }
 
   @Test def checkIterableLike =
-    checkFiles("../scala-library/src/library/scala/collection/IterableLike.scala" :: Nil) { _ =>
+    checkFiles("../scala2-library/src/library/scala/collection/IterableLike.scala" :: Nil) { _ =>
       // success if typer throws no errors! :)
     }
 }
diff --git a/project/Build.scala b/project/Build.scala
@@ -150,7 +150,7 @@ object Build {
     scalacOptions ++= Seq("-bootclasspath", sys.props("sun.boot.class.path")),
 
     // sbt gets very unhappy if two projects use the same target
-    target := baseDirectory.value / ".." / "out" / name.value,
+    target := baseDirectory.value / ".." / "out" / "bootstrap" / name.value,
 
     // The non-bootstrapped dotty-library is not necessary when bootstrapping dotty
     autoScalaLibrary := false,
@@ -994,7 +994,7 @@ object DottyInjectedPlugin extends AutoPlugin {
   }
 
   lazy val submoduleChecks = onLoad in Global := (onLoad in Global).value andThen { state =>
-    val submodules = List(new File("scala-backend"), new File("scala-library"), new File("collection-strawman"))
+    val submodules = List(new File("scala-backend"), new File("scala2-library"), new File("collection-strawman"))
     if (!submodules.forall(f => f.exists && f.listFiles().nonEmpty)) {
       sLog.value.log(Level.Error,
         s"""Missing some of the submodules

diff --git a/scala-library → scala2-library b/scala-library → scala2-library