diff options
| author | Paul Phillips <paulp@improving.org> | 2012-04-20 16:53:28 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-04-20 17:04:45 +0100 |
| commit | 56c1f29250842575b2c3324cc8bd606bda3760d5 (patch) | |
| tree | 904f307c1345caee14856aaeb73ee2ff1f4f2204 /project | |
| parent | 756dbbc254afef97bf4920292d58645bc7708730 (diff) | |
| download | scala-56c1f29250842575b2c3324cc8bd606bda3760d5.tar.gz scala-56c1f29250842575b2c3324cc8bd606bda3760d5.tar.bz2 scala-56c1f29250842575b2c3324cc8bd606bda3760d5.zip | |
Good-bye, scala.dbc.
Another deprecated soul passes on to ether world.
Diffstat (limited to 'project')
| -rw-r--r-- | project/Build.scala | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/project/Build.scala b/project/Build.scala index 9f73563f8e..25fb31cf5b 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -77,9 +77,9 @@ object ScalaBuild extends Build with Layers { ) // Collections of projects to run 'compile' on. - lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, dbc, forkjoin, fjbg) + lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin, fjbg) // Collection of projects to 'package' and 'publish' together. - lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, dbc, continuationsPlugin, jline, scalap) + lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, continuationsPlugin, jline, scalap) lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite) private def epflPomExtra = ( @@ -249,7 +249,6 @@ object ScalaBuild extends Build with Layers { // TODO - Actors + swing separate jars... lazy val dependentProjectSettings = settingOverrides ++ Seq(quickScalaInstance, quickScalaLibraryDependency, addCheaterDependency("scala-library")) lazy val actors = Project("actors", file(".")) settings(dependentProjectSettings:_*) dependsOn(forkjoin % "provided") - lazy val dbc = Project("dbc", file(".")) settings(dependentProjectSettings:_*) // TODO - Remove actors dependency from pom... lazy val swing = Project("swing", file(".")) settings(dependentProjectSettings:_*) dependsOn(actors % "provided") // This project will generate man pages (in man1 and html) for scala. @@ -489,7 +488,7 @@ object ScalaBuild extends Build with Layers { genBin <<= genBinTask(genBinRunner, binDir, fullClasspath in Runtime, false), binDir in genBinQuick <<= baseDirectory apply (_ / "target" / "bin"), // Configure the classpath this way to avoid having .jar files and previous layers on the classpath. - fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,dbc,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq), + fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq), fullClasspath in Runtime in genBinQuick <++= (fullClasspath in Compile in jline), genBinQuick <<= genBinTask(genBinRunner, binDir in genBinQuick, fullClasspath in Runtime in genBinQuick, true), runManmakerMan <<= runManmakerTask(fullClasspath in Runtime in manmaker, runner in manmaker, "scala.tools.docutil.EmitManPage", "man1", ".1"), @@ -518,10 +517,9 @@ object ScalaBuild extends Build with Layers { }, // Add in some more dependencies makeDistMappings <<= (makeDistMappings, - packageBin in swing in Compile, - packageBin in dbc in Compile) map { + packageBin in swing in Compile) map { (dist, s, d) => - dist ++ Seq(s -> "lib/scala-swing.jar", d -> "lib/scala-dbc.jar") + dist ++ Seq(s -> "lib/scala-swing.jar") }, makeDist <<= (makeDistMappings, baseDirectory, streams) map { (maps, dir, s) => s.log.debug("Map = " + maps.mkString("\n")) |