diff options
Diffstat (limited to 'project/Layers.scala')
| -rw-r--r-- | project/Layers.scala | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/project/Layers.scala b/project/Layers.scala index 259e460a52..6c939d0ff7 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,23 +40,23 @@ 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[_]] = - 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 +66,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)), @@ -107,7 +104,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 ) |