From 8d5414030ae08bca5ee23b4c1b17c43b202451ce Mon Sep 17 00:00:00 2001 From: Lukas Rytz Date: Wed, 20 May 2015 10:48:55 +0200 Subject: Remove traces of scala-actors --- build.sbt | 11 +--- dbuild-meta.json | 112 +++++++++++++++-------------------- src/build/dbuild-meta-json-gen.scala | 23 ++++--- 3 files changed, 63 insertions(+), 83 deletions(-) diff --git a/build.sbt b/build.sbt index 553c217d4a..7cc9516cdc 100644 --- a/build.sbt +++ b/build.sbt @@ -206,13 +206,6 @@ lazy val scaladoc = configureAsSubproject(project) lazy val scalap = configureAsSubproject(project). dependsOn(compiler) -// deprecated Scala Actors project -// TODO: it packages into actors.jar but it should be scala-actors.jar -lazy val actors = configureAsSubproject(project) - .settings(generatePropertiesFileSettings: _*) - .settings(name := "scala-actors") - .dependsOn(library) - lazy val forkjoin = configureAsForkOfJavaProject(project) lazy val partestExtras = configureAsSubproject(Project("partest-extras", file(".") / "src" / "partest-extras")) @@ -253,7 +246,7 @@ lazy val partestJavaAgent = (project in file(".") / "src" / "partest-javaagent") ) lazy val test = project. - dependsOn(compiler, interactive, actors, repl, scalap, partestExtras, partestJavaAgent, scaladoc). + dependsOn(compiler, interactive, repl, scalap, partestExtras, partestJavaAgent, scaladoc). configs(IntegrationTest). settings(disableDocsAndPublishingTasks: _*). settings(commonSettings: _*). @@ -284,7 +277,7 @@ lazy val test = project. lazy val root = (project in file(".")). aggregate(library, forkjoin, reflect, compiler, interactive, repl, - scaladoc, scalap, actors, partestExtras, junit).settings( + scaladoc, scalap, partestExtras, junit).settings( sources in Compile := Seq.empty, onLoadMessage := """|*** Welcome to the sbt build definition for Scala! *** |This build definition has an EXPERIMENTAL status. If you are not diff --git a/dbuild-meta.json b/dbuild-meta.json index 90d0104ec1..4806f9fa5a 100644 --- a/dbuild-meta.json +++ b/dbuild-meta.json @@ -1,100 +1,82 @@ { - "version": "2.11.0", - "subproj": [], - "projects": [ + "projects" : [ { - "artifacts": [ + "artifacts" : [ { - "extension": "jar", - "name": "scala-library", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-library", + "organization" : "org.scala-lang" } ], - "dependencies": [], - "name": "scala-library", - "organization": "org.scala-lang" + "dependencies" : [], + "name" : "scala-library", + "organization" : "org.scala-lang" }, { - "artifacts": [ + "artifacts" : [ { - "extension": "jar", - "name": "scala-reflect", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-reflect", + "organization" : "org.scala-lang" } ], - "dependencies": [ + "dependencies" : [ { - "extension": "jar", - "name": "scala-library", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-library", + "organization" : "org.scala-lang" } ], - "name": "scala-reflect", - "organization": "org.scala-lang" + "name" : "scala-reflect", + "organization" : "org.scala-lang" }, { - "artifacts": [ + "artifacts" : [ { - "extension": "jar", - "name": "scala-compiler", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-compiler", + "organization" : "org.scala-lang" } ], - "dependencies": [ + "dependencies" : [ { - "extension": "jar", - "name": "scala-reflect", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-reflect", + "organization" : "org.scala-lang" }, { - "extension": "jar", - "name": "scala-xml", - "organization": "org.scala-lang.modules" + "extension" : "jar", + "name" : "scala-xml", + "organization" : "org.scala-lang.modules" }, { - "extension": "jar", - "name": "scala-parser-combinators", - "organization": "org.scala-lang.modules" + "extension" : "jar", + "name" : "scala-parser-combinators", + "organization" : "org.scala-lang.modules" } ], - "name": "scala-compiler", - "organization": "org.scala-lang" + "name" : "scala-compiler", + "organization" : "org.scala-lang" }, { - "artifacts": [ + "artifacts" : [ { - "extension": "jar", - "name": "scala-actors", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scalap", + "organization" : "org.scala-lang" } ], - "dependencies": [ + "dependencies" : [ { - "extension": "jar", - "name": "scala-library", - "organization": "org.scala-lang" + "extension" : "jar", + "name" : "scala-compiler", + "organization" : "org.scala-lang" } ], - "name": "scala-actors", - "organization": "org.scala-lang" - }, - { - "artifacts": [ - { - "extension": "jar", - "name": "scalap", - "organization": "org.scala-lang" - } - ], - "dependencies": [ - { - "extension": "jar", - "name": "scala-compiler", - "organization": "org.scala-lang" - } - ], - "name": "scalap", - "organization": "org.scala-lang" + "name" : "scalap", + "organization" : "org.scala-lang" } - ] + ], + "subproj" : [], + "version" : "2.12.0" } diff --git a/src/build/dbuild-meta-json-gen.scala b/src/build/dbuild-meta-json-gen.scala index c235978d77..f967fffdd0 100644 --- a/src/build/dbuild-meta-json-gen.scala +++ b/src/build/dbuild-meta-json-gen.scala @@ -1,13 +1,19 @@ -// use this script to generate dbuild-meta.json -// make sure the version is specified correctly, -// update the dependency structure and -// check out distributed-build and run `sbt console`: -// TODO: also generate build.xml and eclipse config from a similar data-structure +// Use this script to generate dbuild-meta.json -import distributed.project.model._ +// To generate the file: +// - check out https://github.com/typesafehub/dbuild +// - run `sbt metadata/console` +// - paste the code below + +// The `version` field is required for the ProjMeta data structure. However, dbuild will +// overwrite the version specified here with the version number found in the build.number +// file, so the actual value doesn't matter, see ScalaBuildSystem: +// https://github.com/typesafehub/dbuild/blob/25b087759cc52876712c594ea4172148beea1310/support/src/main/scala/com/typesafe/dbuild/support/scala/ScalaBuildSystem.scala#L351 + +import com.typesafe.dbuild.model._ val meta = - ExtractedBuildMeta("2.11.0", Seq( + ProjMeta(version = "2.12.0", projects = Seq( Project("scala-library", "org.scala-lang", Seq(ProjectRef("scala-library", "org.scala-lang")), Seq.empty), // TODO: forkjoin @@ -19,7 +25,6 @@ val meta = 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", @@ -40,4 +45,4 @@ val meta = )) -println(Utils.writeValue(meta)) +println(Utils.writeValueFormatted(meta)) -- cgit v1.2.3