summaryrefslogtreecommitdiff
path: root/project/Layers.scala
diff options
context:
space:
mode:
authorJosh Suereth <joshua.suereth@gmail.com>2011-12-05 10:12:44 -0500
committerJosh Suereth <joshua.suereth@gmail.com>2011-12-05 10:12:44 -0500
commit7780a3667f5f9977215eba80e483d90cbdcfbb94 (patch)
tree9378ce227c9fcc4050d7f9807013de4290f406e5 /project/Layers.scala
parent1ed57a4c19f89bc6736271fd63d465fed405c4d3 (diff)
downloadscala-7780a3667f5f9977215eba80e483d90cbdcfbb94.tar.gz
scala-7780a3667f5f9977215eba80e483d90cbdcfbb94.tar.bz2
scala-7780a3667f5f9977215eba80e483d90cbdcfbb94.zip
Step one towards using project revision to build
Diffstat (limited to 'project/Layers.scala')
-rw-r--r--project/Layers.scala6
1 files changed, 4 insertions, 2 deletions
diff --git a/project/Layers.scala b/project/Layers.scala
index cdd68554ed..84c926f072 100644
--- a/project/Layers.scala
+++ b/project/Layers.scala
@@ -1,5 +1,7 @@
import sbt._
import Keys._
+import com.jsuereth.git.GitKeys.gitRunner
+
/** This trait stores all the helper methods to generate layers in Scala's layered build. */
trait Layers extends Build {
// TODO - Clean this up or use a self-type.
@@ -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) map Release.generatePropertiesFile("library.properties"),
+ resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner) map Release.generatePropertiesFile("library.properties"),
referenceScala
)) :_*)
@@ -67,7 +69,7 @@ trait Layers extends Build {
scalaSource in Compile <<= (baseDirectory) apply (_ / "src" / "compiler"),
resourceDirectory in Compile <<= baseDirectory apply (_ / "src" / "compiler"),
defaultExcludes in unmanagedResources := "*.scala",
- resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged) map Release.generatePropertiesFile("compiler.properties"),
+ resourceGenerators in Compile <+= (baseDirectory, version, resourceManaged, gitRunner) map Release.generatePropertiesFile("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 {