diff options
author | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 09:48:03 -0400 |
---|---|---|
committer | Josh Suereth <joshua.suereth@gmail.com> | 2012-05-10 09:48:03 -0400 |
commit | d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1 (patch) | |
tree | 5a7c36f38ba2f5af1080427cc9f37a45d5bed2ff /project/Layers.scala | |
parent | 3012bd9205636f0a4614d6dec65ffe5f86b719f6 (diff) | |
parent | 31546d1b3d841a0fddc9c84af48361c74243ce8e (diff) | |
download | scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.tar.gz scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.tar.bz2 scala-d9ca44bd31532c91df124cdd2f6f2a417bb4a0e1.zip |
Merge remote-tracking branch 'jsuereth/sbt-build' into sbt-build-0.11.3
Diffstat (limited to 'project/Layers.scala')
-rw-r--r-- | project/Layers.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/project/Layers.scala b/project/Layers.scala index d39e58014c..b15b327895 100644 --- a/project/Layers.scala +++ b/project/Layers.scala @@ -16,6 +16,8 @@ trait Layers extends Build { def fjbg: Project /** A setting that adds some external dependencies. */ def externalDeps: Setting[_] + /** The root project. */ + 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). @@ -57,7 +59,7 @@ trait Layers extends Build { // TODO - Allow other scalac option settings. scalacOptions in Compile <++= (scalaSource in Compile) map (src => Seq("-sourcepath", src.getAbsolutePath)), classpathOptions := ClasspathOptions.manual, - resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner, streams) map Release.generatePropertiesFile("library.properties"), + resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, streams) map Versions.generateVersionPropertiesFile("library.properties"), referenceScala ) @@ -70,7 +72,7 @@ trait Layers extends Build { defaultExcludes := ("tests"), javacOptions ++= Seq("-source", "1.4"), defaultExcludes in unmanagedResources := "*.scala", - resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner, streams) map Release.generatePropertiesFile("compiler.properties"), + resourceGenerators in Compile <+= (resourceManaged, Versions.scalaVersions, streams) map Versions.generateVersionPropertiesFile("compiler.properties"), // Note, we might be able to use the default task, but for some reason ant was filtering files out. Not sure what's up, but we'll // stick with that for now. unmanagedResources in Compile <<= (baseDirectory) map { |