From 15155567fb78b0ccb009477e9b38061913b7489d Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Thu, 5 Sep 2013 17:08:51 -0400
Subject: Fix dbuild meta info: remove scaladoc project

That is, scaladoc is still in the scala-compiler artifact.
Let dbuild know so that it won't freak out.

ps: dbuild-meta.json should be kept in synch with
    src/build/dbuild-meta-json-gen.scala until we can
    automate that in the build
---
 dbuild-meta.json                     | 43 +++++++++---------------------------
 src/build/dbuild-meta-json-gen.scala | 12 ++++++----
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/dbuild-meta.json b/dbuild-meta.json
index faf75a46b5..8d3b65afd0 100644
--- a/dbuild-meta.json
+++ b/dbuild-meta.json
@@ -45,6 +45,16 @@
                     "extension": "jar",
                     "name": "scala-reflect",
                     "organization": "org.scala-lang"
+                },
+                {
+                    "extension": "jar",
+                    "name": "scala-xml",
+                    "organization": "org.scala-lang.modules"
+                },
+                {
+                    "extension": "jar",
+                    "name": "scala-parser-combinators",
+                    "organization": "org.scala-lang.modules"
                 }
             ],
             "name": "scala-compiler",
@@ -86,39 +96,6 @@
             "name": "scala-actors",
             "organization": "org.scala-lang"
         },
-        {
-            "artifacts": [
-                {
-                    "extension": "jar",
-                    "name": "scaladoc",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "dependencies": [
-                {
-                    "extension": "jar",
-                    "name": "scala-compiler",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-partest",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-xml",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-parser-combinators",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "name": "scaladoc",
-            "organization": "org.scala-lang"
-        },
         {
             "artifacts": [
                 {
diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala
index 78d4f3e65c..ee1976ffa4 100644
--- a/src/build/dbuild-meta-json-gen.scala
+++ b/src/build/dbuild-meta-json-gen.scala
@@ -16,7 +16,11 @@ val meta =
       Seq(ProjectRef("scala-library", "org.scala-lang"))),
     Project("scala-compiler", "org.scala-lang",
       Seq(ProjectRef("scala-compiler", "org.scala-lang")),
-      Seq(ProjectRef("scala-reflect", "org.scala-lang"))), // asm
+      Seq(ProjectRef("scala-reflect", "org.scala-lang"),
+          ProjectRef("scala-xml", "org.scala-lang.modules"),
+          ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
+          // asm
+         )),
 
     // Project("scala-repl", "org.scala-lang",
     //   Seq(ProjectRef("scala-repl", "org.scala-lang")),
@@ -34,9 +38,9 @@ val meta =
       Seq(ProjectRef("scala-actors", "org.scala-lang")),
       Seq(ProjectRef("scala-library", "org.scala-lang"))),
 
-    Project("scaladoc", "org.scala-lang",
-      Seq(ProjectRef("scaladoc", "org.scala-lang")),
-      Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))),
+    // Project("scaladoc", "org.scala-lang",
+    //   Seq(ProjectRef("scaladoc", "org.scala-lang")),
+    //   Seq(ProjectRef("scala-compiler", "org.scala-lang"),ProjectRef("scala-partest", "org.scala-lang"), ProjectRef("scala-xml", "org.scala-lang"), ProjectRef("scala-parser-combinators", "org.scala-lang"))),
 
     Project("scalap", "org.scala-lang",
       Seq(ProjectRef("scalap", "org.scala-lang")),
-- 
cgit v1.2.3