Expunged the .net backend.

It lives on in a branch born from this commit's parent.
It's abrupt; no attempt is made to offer a "smooth transition"
for the serious msil userbase, population zero. If anyone feels
very strongly that such a transition is necessary, I will be
happy to talk you into feeling differently.

2 files changed, 20 insertions, 21 deletions

diff --git a/project/Build.scala b/project/Build.scala
index a50a572d54..80a3fb42f1 100644
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -11,7 +11,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   override lazy val settings = super.settings ++ Versions.settings ++ Seq(
     autoScalaLibrary := false,
     resolvers += Resolver.url(
-      "Typesafe nightlies", 
+      "Typesafe nightlies",
       url("https://typesafe.artifactoryonline.com/typesafe/ivy-snapshots/")
     )(Resolver.ivyStylePatterns),
     resolvers ++= Seq(
@@ -21,14 +21,14 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
     organization := "org.scala-lang",
     version <<= Versions.mavenVersion,
     pomExtra := epflPomExtra
-  ) 
+  )
 
   // Collections of projects to run 'compile' on.
   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, actors, continuationsPlugin, jline, scalap)
   lazy val partestRunProjects = Seq(testsuite, continuationsTestsuite)
-  
+
   private def epflPomExtra = (
     <xml:group>
       <inceptionYear>2002</inceptionYear>
@@ -47,7 +47,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
       </issueManagement>
     </xml:group>
   )
-    
+
   // Settings used to make sure publishing goes smoothly.
   def publishSettings: Seq[Setting[_]] = Seq(
     ivyScala ~= ((is: Option[IvyScala]) => is.map(_.copy(checkExplicit = false))),
@@ -91,7 +91,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   lazy val aaa_root = Project("scala", file(".")) settings(projectSettings: _*) settings(ShaResolve.settings: _*)
 
   // External dependencies used for various projects
-  lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v => 
+  lazy val externalDeps: Setting[_] = libraryDependencies <<= (sbtVersion)(v =>
     Seq(
       "org.apache.ant" % "ant" % "1.8.2",
       "org.scala-sbt" % "compiler-interface" % v % "provided"
@@ -134,7 +134,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   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.
+  // Our wrapped version of asm.
   lazy val asm = Project("asm", file(".")) settings(settingOverrides : _*)
   // Forkjoin backport
   lazy val forkjoin = Project("forkjoin", file(".")) settings(settingOverrides : _*)
@@ -175,9 +175,9 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   // --------------------------------------------------------------
   //  Projects dependent on layered compilation (quick)
   // --------------------------------------------------------------
-  def addCheaterDependency(projectName: String): Setting[_] = 
-    pomPostProcess <<= (version, organization, pomPostProcess) apply { (v,o,k) => 
-      val dependency: scala.xml.Node = 
+  def addCheaterDependency(projectName: String): Setting[_] =
+    pomPostProcess <<= (version, organization, pomPostProcess) apply { (v,o,k) =>
+      val dependency: scala.xml.Node =
         <dependency>
           <groupId>{o}</groupId>
           <artifactid>{projectName}</artifactid>
@@ -193,10 +193,10 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
           case n: scala.xml.Elem if n.label == "dependencies" => n
         } isEmpty)
       // TODO - Keep namespace on project...
-      k andThen { 
+      k andThen {
         case n @ <project>{ nested@_*}</project> if hasDependencies(n)   =>
           <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">{nested}<dependencies>{dependency}</dependencies></project>
-        case <project>{ nested@_*}</project>                                       => 
+        case <project>{ nested@_*}</project>                                       =>
           <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">{ nested map fixDependencies }</project>
       }
     }
@@ -205,7 +205,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   lazy val dependentProjectSettings = settingOverrides ++ Seq(quickScalaInstance, quickScalaLibraryDependency, addCheaterDependency("scala-library"))
   lazy val actors = Project("scala-actors", file(".")) settings(dependentProjectSettings:_*) dependsOn(forkjoin % "provided")
   lazy val swing = Project("scala-swing", file(".")) settings(dependentProjectSettings:_*) dependsOn(actors % "provided")
-  // This project will generate man pages (in man1 and html) for scala.    
+  // This project will generate man pages (in man1 and html) for scala.
   lazy val manmakerSettings: Seq[Setting[_]] = dependentProjectSettings :+ externalDeps
   lazy val manmaker = Project("manual", file(".")) settings(manmakerSettings:_*)
 
@@ -234,7 +234,7 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   lazy val continuationsPlugin = Project("continuations-plugin", file(".")) settings(continuationsPluginSettings:_*)
   lazy val continuationsLibrarySettings = dependentProjectSettings ++ Seq(
     scalaSource in Compile <<= baseDirectory(_ / "src/continuations/library/"),
-    scalacOptions in Compile <++= (exportedProducts in Compile in continuationsPlugin) map { 
+    scalacOptions in Compile <++= (exportedProducts in Compile in continuationsPlugin) map {
      case Seq(cpDir) => Seq("-Xplugin-require:continuations", "-P:continuations:enable", "-Xplugin:"+cpDir.data.getAbsolutePath)
     }
   )
@@ -297,11 +297,11 @@ object ScalaBuild extends Build with Layers with Packaging with Testing {
   lazy val scalaCompiler = Project("scala-compiler", file(".")) settings(publishSettings:_*) settings(scalaBinArtifactSettings:_*) dependsOn(scalaReflect)
   lazy val fullQuickScalaReference = makeScalaReference("pack", scalaLibrary, scalaReflect, scalaCompiler)
 
-  
+
   // --------------------------------------------------------------
   //  Generating Documentation.
   // --------------------------------------------------------------
-  
+
   // TODO - Migrate this into the dist project.
   // Scaladocs
   lazy val documentationSettings: Seq[Setting[_]] = dependentProjectSettings ++ Seq(
diff --git a/project/Layers.scala b/project/Layers.scala
index 35cc79c130..259e460a52 100644
--- a/project/Layers.scala
+++ b/project/Layers.scala
@@ -47,19 +47,19 @@ trait Layers extends Build {
          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".
    */
   def makeLayer(layer: String, referenceScala: Setting[Task[ScalaInstance]], autoLock: Boolean = false) : (Project, Project, Project) = {
-    val autoLockSettings: Seq[Setting[_]] = 
-      if(autoLock) Seq(compile in Compile <<= (compile in Compile, lock) apply { (c, l) => 
+    val autoLockSettings: Seq[Setting[_]] =
+      if(autoLock) Seq(compile in Compile <<= (compile in Compile, lock) apply { (c, l) =>
         c flatMapR { cResult =>
           val result = Result.tryValue(cResult)
           l mapR { tx => result }
         }
-      }) 
+      })
       else Seq.empty
 
 
@@ -69,7 +69,7 @@ trait Layers extends Build {
       unmanagedClasspath in Compile <<= (exportedProducts in forkjoin in Compile).identity,
       managedClasspath in Compile := Seq(),
       scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "library"),
-      resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "library"),   
+      resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "library"),
       defaultExcludes in unmanagedResources := ("*.scala" | "*.java" | "*.disabled"),
       // TODO - Allow other scalac option settings.
       scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)),
@@ -96,7 +96,6 @@ trait Layers extends Build {
       version := layer,
       scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "compiler"),
       resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "compiler"),
-      unmanagedSourceDirectories in Compile <+= (baseDirectory) apply (_ / "src" / "msil"),
       defaultExcludes := ("tests"),
       defaultExcludes in unmanagedResources := "*.scala",
       resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, skip in Compile, streams) map Versions.generateVersionPropertiesFile("compiler.properties"),