Skip to content

Commit 1515556

Browse files
jsuerethadriaanm
authored andcommitted
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
1 parent ce5c506 commit 1515556

File tree

2 files changed

+18
-37
lines changed

2 files changed

+18
-37
lines changed

dbuild-meta.json

+10-33
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,16 @@
4545
"extension": "jar",
4646
"name": "scala-reflect",
4747
"organization": "org.scala-lang"
48+
},
49+
{
50+
"extension": "jar",
51+
"name": "scala-xml",
52+
"organization": "org.scala-lang.modules"
53+
},
54+
{
55+
"extension": "jar",
56+
"name": "scala-parser-combinators",
57+
"organization": "org.scala-lang.modules"
4858
}
4959
],
5060
"name": "scala-compiler",
@@ -86,39 +96,6 @@
8696
"name": "scala-actors",
8797
"organization": "org.scala-lang"
8898
},
89-
{
90-
"artifacts": [
91-
{
92-
"extension": "jar",
93-
"name": "scaladoc",
94-
"organization": "org.scala-lang"
95-
}
96-
],
97-
"dependencies": [
98-
{
99-
"extension": "jar",
100-
"name": "scala-compiler",
101-
"organization": "org.scala-lang"
102-
},
103-
{
104-
"extension": "jar",
105-
"name": "scala-partest",
106-
"organization": "org.scala-lang"
107-
},
108-
{
109-
"extension": "jar",
110-
"name": "scala-xml",
111-
"organization": "org.scala-lang"
112-
},
113-
{
114-
"extension": "jar",
115-
"name": "scala-parser-combinators",
116-
"organization": "org.scala-lang"
117-
}
118-
],
119-
"name": "scaladoc",
120-
"organization": "org.scala-lang"
121-
},
12299
{
123100
"artifacts": [
124101
{

src/build/dbuild-meta-json-gen.scala

+8-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@ val meta =
1616
Seq(ProjectRef("scala-library", "org.scala-lang"))),
1717
Project("scala-compiler", "org.scala-lang",
1818
Seq(ProjectRef("scala-compiler", "org.scala-lang")),
19-
Seq(ProjectRef("scala-reflect", "org.scala-lang"))), // asm
19+
Seq(ProjectRef("scala-reflect", "org.scala-lang"),
20+
ProjectRef("scala-xml", "org.scala-lang.modules"),
21+
ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
22+
// asm
23+
)),
2024

2125
// Project("scala-repl", "org.scala-lang",
2226
// Seq(ProjectRef("scala-repl", "org.scala-lang")),
@@ -34,9 +38,9 @@ val meta =
3438
Seq(ProjectRef("scala-actors", "org.scala-lang")),
3539
Seq(ProjectRef("scala-library", "org.scala-lang"))),
3640

37-
Project("scaladoc", "org.scala-lang",
38-
Seq(ProjectRef("scaladoc", "org.scala-lang")),
39-
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"))),
41+
// Project("scaladoc", "org.scala-lang",
42+
// Seq(ProjectRef("scaladoc", "org.scala-lang")),
43+
// 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"))),
4044

4145
Project("scalap", "org.scala-lang",
4246
Seq(ProjectRef("scalap", "org.scala-lang")),

0 commit comments

Comments
 (0)