summaryrefslogtreecommitdiff
path: root/project/Layers.scala
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-12-05 12:49:21 -0800
committerPaul Phillips <paulp@improving.org>2012-12-05 17:55:55 -0800
commit96fa31d0a3cf7ff401f9197cd0e12acd296e55b1 (patch)
tree1b6a876f276988886b41e47f8f41b3f83e5764b8 /project/Layers.scala
parent9547753a80fab450c842cb4a9a8296aa41875ff3 (diff)
downloadscala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.tar.gz
scala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.tar.bz2
scala-96fa31d0a3cf7ff401f9197cd0e12acd296e55b1.zip
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.
Diffstat (limited to 'project/Layers.scala')
-rw-r--r--project/Layers.scala11
1 files changed, 5 insertions, 6 deletions
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"),