Skip to content

Commit 2a40ad9

Browse files
adriaanmadriaanm
committed
Merge pull request scala#4510 from lrytz/actors-traces
Remove traces of scala-actors
2 parents 2a58ea2 + 8d54140 commit 2a40ad9

File tree

3 files changed

+63
-83
lines changed

3 files changed

+63
-83
lines changed

‎build.sbt

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,13 +206,6 @@ lazy val scaladoc = configureAsSubproject(project)
206206
lazy val scalap = configureAsSubproject(project).
207207
dependsOn(compiler)
208208

209-
// deprecated Scala Actors project
210-
// TODO: it packages into actors.jar but it should be scala-actors.jar
211-
lazy val actors = configureAsSubproject(project)
212-
.settings(generatePropertiesFileSettings: _*)
213-
.settings(name := "scala-actors")
214-
.dependsOn(library)
215-
216209
lazy val forkjoin = configureAsForkOfJavaProject(project)
217210

218211
lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".") / "src" / "partest-extras"))
@@ -253,7 +246,7 @@ lazy val partestJavaAgent = (project in file(".") / "src" / "partest-javaagent")
253246
)
254247

255248
lazy val test = project.
256-
dependsOn(compiler, interactive, actors, repl, scalap, partestExtras, partestJavaAgent, scaladoc).
249+
dependsOn(compiler, interactive, repl, scalap, partestExtras, partestJavaAgent, scaladoc).
257250
configs(IntegrationTest).
258251
settings(disableDocsAndPublishingTasks: _*).
259252
settings(commonSettings: _*).
@@ -284,7 +277,7 @@ lazy val test = project.
284277

285278
lazy val root = (project in file(".")).
286279
aggregate(library, forkjoin, reflect, compiler, interactive, repl,
287-
scaladoc, scalap, actors, partestExtras, junit).settings(
280+
scaladoc, scalap, partestExtras, junit).settings(
288281
sources in Compile := Seq.empty,
289282
onLoadMessage := """|*** Welcome to the sbt build definition for Scala! ***
290283
|This build definition has an EXPERIMENTAL status. If you are not

‎dbuild-meta.json

Lines changed: 47 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,82 @@
11
{
2-
"version": "2.11.0",
3-
"subproj": [],
4-
"projects": [
2+
"projects" : [
53
{
6-
"artifacts": [
4+
"artifacts" : [
75
{
8-
"extension": "jar",
9-
"name": "scala-library",
10-
"organization": "org.scala-lang"
6+
"extension" : "jar",
7+
"name" : "scala-library",
8+
"organization" : "org.scala-lang"
119
}
1210
],
13-
"dependencies": [],
14-
"name": "scala-library",
15-
"organization": "org.scala-lang"
11+
"dependencies" : [],
12+
"name" : "scala-library",
13+
"organization" : "org.scala-lang"
1614
},
1715
{
18-
"artifacts": [
16+
"artifacts" : [
1917
{
20-
"extension": "jar",
21-
"name": "scala-reflect",
22-
"organization": "org.scala-lang"
18+
"extension" : "jar",
19+
"name" : "scala-reflect",
20+
"organization" : "org.scala-lang"
2321
}
2422
],
25-
"dependencies": [
23+
"dependencies" : [
2624
{
27-
"extension": "jar",
28-
"name": "scala-library",
29-
"organization": "org.scala-lang"
25+
"extension" : "jar",
26+
"name" : "scala-library",
27+
"organization" : "org.scala-lang"
3028
}
3129
],
32-
"name": "scala-reflect",
33-
"organization": "org.scala-lang"
30+
"name" : "scala-reflect",
31+
"organization" : "org.scala-lang"
3432
},
3533
{
36-
"artifacts": [
34+
"artifacts" : [
3735
{
38-
"extension": "jar",
39-
"name": "scala-compiler",
40-
"organization": "org.scala-lang"
36+
"extension" : "jar",
37+
"name" : "scala-compiler",
38+
"organization" : "org.scala-lang"
4139
}
4240
],
43-
"dependencies": [
41+
"dependencies" : [
4442
{
45-
"extension": "jar",
46-
"name": "scala-reflect",
47-
"organization": "org.scala-lang"
43+
"extension" : "jar",
44+
"name" : "scala-reflect",
45+
"organization" : "org.scala-lang"
4846
},
4947
{
50-
"extension": "jar",
51-
"name": "scala-xml",
52-
"organization": "org.scala-lang.modules"
48+
"extension" : "jar",
49+
"name" : "scala-xml",
50+
"organization" : "org.scala-lang.modules"
5351
},
5452
{
55-
"extension": "jar",
56-
"name": "scala-parser-combinators",
57-
"organization": "org.scala-lang.modules"
53+
"extension" : "jar",
54+
"name" : "scala-parser-combinators",
55+
"organization" : "org.scala-lang.modules"
5856
}
5957
],
60-
"name": "scala-compiler",
61-
"organization": "org.scala-lang"
58+
"name" : "scala-compiler",
59+
"organization" : "org.scala-lang"
6260
},
6361
{
64-
"artifacts": [
62+
"artifacts" : [
6563
{
66-
"extension": "jar",
67-
"name": "scala-actors",
68-
"organization": "org.scala-lang"
64+
"extension" : "jar",
65+
"name" : "scalap",
66+
"organization" : "org.scala-lang"
6967
}
7068
],
71-
"dependencies": [
69+
"dependencies" : [
7270
{
73-
"extension": "jar",
74-
"name": "scala-library",
75-
"organization": "org.scala-lang"
71+
"extension" : "jar",
72+
"name" : "scala-compiler",
73+
"organization" : "org.scala-lang"
7674
}
7775
],
78-
"name": "scala-actors",
79-
"organization": "org.scala-lang"
80-
},
81-
{
82-
"artifacts": [
83-
{
84-
"extension": "jar",
85-
"name": "scalap",
86-
"organization": "org.scala-lang"
87-
}
88-
],
89-
"dependencies": [
90-
{
91-
"extension": "jar",
92-
"name": "scala-compiler",
93-
"organization": "org.scala-lang"
94-
}
95-
],
96-
"name": "scalap",
97-
"organization": "org.scala-lang"
76+
"name" : "scalap",
77+
"organization" : "org.scala-lang"
9878
}
99-
]
79+
],
80+
"subproj" : [],
81+
"version" : "2.12.0"
10082
}

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

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
// use this script to generate dbuild-meta.json
2-
// make sure the version is specified correctly,
3-
// update the dependency structure and
4-
// check out distributed-build and run `sbt console`:
5-
// TODO: also generate build.xml and eclipse config from a similar data-structure
1+
// Use this script to generate dbuild-meta.json
62

7-
import distributed.project.model._
3+
// To generate the file:
4+
// - check out https://github.com/typesafehub/dbuild
5+
// - run `sbt metadata/console`
6+
// - paste the code below
7+
8+
// The `version` field is required for the ProjMeta data structure. However, dbuild will
9+
// overwrite the version specified here with the version number found in the build.number
10+
// file, so the actual value doesn't matter, see ScalaBuildSystem:
11+
// https://github.com/typesafehub/dbuild/blob/25b087759cc52876712c594ea4172148beea1310/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala#L351
12+
13+
import com.typesafe.dbuild.model._
814

915
val meta =
10-
ExtractedBuildMeta("2.11.0", Seq(
16+
ProjMeta(version = "2.12.0", projects = Seq(
1117
Project("scala-library", "org.scala-lang",
1218
Seq(ProjectRef("scala-library", "org.scala-lang")),
1319
Seq.empty), // TODO: forkjoin
@@ -19,7 +25,6 @@ val meta =
1925
Seq(ProjectRef("scala-reflect", "org.scala-lang"),
2026
ProjectRef("scala-xml", "org.scala-lang.modules"),
2127
ProjectRef("scala-parser-combinators", "org.scala-lang.modules")
22-
// asm
2328
)),
2429

2530
// Project("scala-repl", "org.scala-lang",
@@ -40,4 +45,4 @@ val meta =
4045

4146
))
4247

43-
println(Utils.writeValue(meta))
48+
println(Utils.writeValueFormatted(meta))

0 commit comments

Comments
 (0)