From ed37907d4fe426ba804fee9d6c7c4062ae4cce5f Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Tue, 12 Nov 2013 14:18:52 -0800
Subject: Refactoring to prepare modularization of the compiler.

Actual modularization is delayed until 2.12.

The one big (one-line) change is to make the interactive compiler independent
of scaladoc. We have one "integration test": `MemoryLeaksTest`.

This commit adds a bunch of comments marked `TODO: modularize the compiler`,
that should be uncommented when we're ready to continue the modularization
effort.

I decided to merge them commented out to avoid having to rebase xml patches.
There's still some chance of bitrot, but I'm willing to take my chances.

I previously refactored the build to make it easier to add jars in a coherent
way, which hinges on the `init-project-prop` mechanism, so the relevant
properties are already injected there.
---
 src/build/maven/scala-compiler-pom.xml | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/build/maven/scala-compiler-pom.xml')

diff --git a/src/build/maven/scala-compiler-pom.xml b/src/build/maven/scala-compiler-pom.xml
index 442fe6a8d5..a16fe22343 100644
--- a/src/build/maven/scala-compiler-pom.xml
+++ b/src/build/maven/scala-compiler-pom.xml
@@ -35,23 +35,22 @@
       <version>@VERSION@</version>
     </dependency>
     <dependency>
-      <!-- for scaladoc -->
+      <groupId>org.scala-lang</groupId>
+      <artifactId>scala-reflect</artifactId>
+      <version>@VERSION@</version>
+    </dependency>
+    <!-- TODO modularize compiler: these dependencies will disappear then the compiler is modularized -->
+    <dependency> <!-- for scala-compiler-doc -->
       <groupId>org.scala-lang.modules</groupId>
       <artifactId>scala-xml_@SCALA_BINARY_VERSION@</artifactId>
       <version>@XML_VERSION@</version>
     </dependency>
-    <dependency>
-      <!-- for scaladoc -->
+    <dependency> <!-- for scala-compiler-doc -->
       <groupId>org.scala-lang.modules</groupId>
       <artifactId>scala-parser-combinators_@SCALA_BINARY_VERSION@</artifactId>
       <version>@PARSER_COMBINATORS_VERSION@</version>
     </dependency>
-    <dependency>
-      <groupId>org.scala-lang</groupId>
-      <artifactId>scala-reflect</artifactId>
-      <version>@VERSION@</version>
-    </dependency>
-    <dependency>
+    <dependency> <!-- for scala-compiler-repl-->
       <groupId>jline</groupId>
       <artifactId>jline</artifactId>
       <version>@JLINE_VERSION@</version>
-- 
cgit v1.2.3