Merge commit 'refs/pull/1717/head' into merge-msil-genjvm-delete

* commit 'refs/pull/1717/head':
  SI-6769 Removes GenJVM backend

Conflicts:
	src/compiler/scala/tools/nsc/backend/jvm/GenAndroid.scala

4 files changed, 11 insertions, 16 deletions

diff --git a/project/Build.scala b/project/Build.scala
index a50a572d54..ed03028fcc 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -24,7 +24,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   ) 
 
   // Collections of projects to run 'compile' on.
-  lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin, fjbg)
+  lazy val compiledProjects = Seq(quickLib, quickComp, continuationsLibrary, actors, swing, forkjoin)
   // Collection of projects to 'package' and 'publish' together.
   lazy val packagedBinaryProjects = Seq(scalaLibrary, scalaCompiler, swing, actors, continuationsPlugin, jline, scalap)
   lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite)
@@ -82,7 +82,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
     makeExplodedDist <<= (makeExplodedDist in scaladist).identity,
     // Note: We override unmanagedSources so that ~ compile will look at all these sources, then run our aggregated compile...
     unmanagedSourceDirectories in Compile <<= baseDirectory apply (_ / "src") apply { dir =>
-      Seq("library/scala","actors","compiler","fjbg","swing","continuations/library","forkjoin") map (dir / _)
+      Seq("library/scala","actors","compiler","swing","continuations/library","forkjoin") map (dir / _)
     },
     // TODO - Make exported products == makeDist so we can use this when creating a *real* distribution.
     commands += Release.pushStarr
@@ -132,8 +132,6 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
 
   // Jline nested project.   Compile this sucker once and be done.
   lazy val jline = Project("jline", file("src/jline"))
-  // Fast Java Bytecode Generator (nested in every scala-compiler.jar)
-  lazy val fjbg = Project("fjbg", file(".")) settings(settingOverrides : _*)
   // Our wrapped version of msil.
   lazy val asm = Project("asm", file(".")) settings(settingOverrides : _*)
   // Forkjoin backport
@@ -283,7 +281,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   // --------------------------------------------------------------
   //  Real Compiler Artifact
   // --------------------------------------------------------------
-  lazy val packageScalaBinTask = Seq(quickComp, fjbg, asm).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping)
+  lazy val packageScalaBinTask = Seq(quickComp, asm).map(p => products in p in Compile).join.map(_.flatten).map(productTaskToMapping)
   lazy val scalaBinArtifactSettings : Seq[Setting[_]] = inConfig(Compile)(Defaults.packageTasks(packageBin, packageScalaBinTask)) ++ Seq(
     name := "scala-compiler",
     crossPaths := false,
@@ -331,6 +329,6 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   lazy val documentation = (
     Project("documentation", file("."))
     settings (documentationSettings: _*)
-    dependsOn(quickLib, quickComp, actors, fjbg, forkjoin, swing, continuationsLibrary)
+    dependsOn(quickLib, quickComp, actors, forkjoin, swing, continuationsLibrary)
   )
 }
diff --git a/project/Layers.scala b/project/Layers.scala
index 35cc79c130..009129efcf 100644
--- a/project/Layers.scala
+++ b/project/Layers.scala
@@ -13,8 +13,6 @@ trait Layers extends Build {
   def jline: Project
   /** Reference to forkjoin library */
   def forkjoin: Project
-  /** Reference to Fast-Java-Bytecode-Generator library */
-  def fjbg: Project
   /** Reference to the ASM wrapped project. */
   def asm: Project
   /** A setting that adds some external dependencies. */
@@ -23,7 +21,7 @@ trait Layers extends Build {
   def aaa_root: Project
 
   /** Creates a reference Scala version that can be used to build other projects.   This takes in the raw
-    * library, compiler and fjbg libraries as well as a string representing the layer name (used for compiling the compile-interface).
+    * library, compiler as well as a string representing the layer name (used for compiling the compile-interface).
     */
   def makeScalaReference(layer: String, library: Project, reflect: Project, compiler: Project) =
      scalaInstance <<= (appConfiguration in library,
@@ -31,10 +29,9 @@ trait Layers extends Build {
                         (exportedProducts in library in Compile),
                         (exportedProducts in reflect in Compile),
                         (exportedProducts in compiler in Compile),
-                        (exportedProducts in fjbg in Compile),
                         (fullClasspath in jline in Runtime),
                         (exportedProducts in asm in Runtime)) map {
-    (app, version: String, lib: Classpath, reflect: Classpath, comp: Classpath, fjbg: Classpath, jline: Classpath, asm: Classpath) =>
+    (app, version: String, lib: Classpath, reflect: Classpath, comp: Classpath, jline: Classpath, asm: Classpath) =>
       val launcher = app.provider.scalaProvider.launcher
       (lib,comp) match {
          case (Seq(libraryJar), Seq(compilerJar)) =>
@@ -43,14 +40,14 @@ trait Layers extends Build {
              libraryJar.data,
              compilerJar.data,
              launcher,
-             ((fjbg.files ++ jline.files ++ asm.files ++ reflect.files):_*))
+             ((jline.files ++ asm.files ++ reflect.files):_*))
          case _ => error("Cannot build a ScalaReference with more than one classpath element")
       }
   }
   
   /** Creates a "layer" of Scala compilation.  That is, this will build the next version of Scala from a previous version.
    * Returns the library project and compiler project from the next layer.
-   * Note:  The library and compiler are not *complete* in the sense that they are missing things like "actors" and "fjbg".
+   * Note:  The library and compiler are not *complete* in the sense that they are missing things like "actors".
    */
   def makeLayer(layer: String, referenceScala: Setting[Task[ScalaInstance]], autoLock: Boolean = false) : (Project, Project, Project) = {
     val autoLockSettings: Seq[Setting[_]] = 
@@ -108,7 +105,7 @@ trait Layers extends Build {
           dirs.descendentsExcept( ("*.xml" | "*.html" | "*.gif" | "*.png" | "*.js" | "*.css" | "*.tmpl" | "*.swf" | "*.properties" | "*.txt"),"*.scala").get
       },
       // TODO - Use depends on *and* SBT's magic dependency mechanisms...
-      unmanagedClasspath in Compile <<= Seq(forkjoin, library, reflect, fjbg, jline, asm).map(exportedProducts in Compile in _).join.map(_.flatten),
+      unmanagedClasspath in Compile <<= Seq(forkjoin, library, reflect, jline, asm).map(exportedProducts in Compile in _).join.map(_.flatten),
       externalDeps,
       referenceScala
     )
diff --git a/project/Packaging.scala b/project/Packaging.scala
index eb4e69f99e..6cb51a10a6 100644
--- a/project/Packaging.scala
+++ b/project/Packaging.scala
@@ -19,7 +19,7 @@ trait Packaging { self: ScalaBuild.type =>
     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,fjbg,jline,forkjoin).map(classDirectory in Compile in _).join.map(Attributed.blankSeq),
+    fullClasspath in Runtime in genBinQuick <<= Seq(quickComp,quickLib,scalap,actors,swing,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"),
diff --git a/project/Testing.scala b/project/Testing.scala
index 5de72116a3..de63a66164 100644
--- a/project/Testing.scala
+++ b/project/Testing.scala
@@ -34,7 +34,7 @@ trait Testing { self: ScalaBuild.type =>
   val continuationsTestsuite = (
     Project("continuations-testsuite", file("."))
     settings (continuationsTestsuiteSettings:_*) 
-    dependsOn (partest, scalaLibrary, scalaCompiler, fjbg)
+    dependsOn (partest, scalaLibrary, scalaCompiler)
   )
 
 }