From 15155567fb78b0ccb009477e9b38061913b7489d Mon Sep 17 00:00:00 2001 From: Josh Suereth 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 --- src/build/dbuild-meta-json-gen.scala | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/build/dbuild-meta-json-gen.scala') 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