summaryrefslogtreecommitdiff
path: root/project/build/BasicLayer.scala
diff options
context:
space:
mode:
Diffstat (limited to 'project/build/BasicLayer.scala')
-rw-r--r--project/build/BasicLayer.scala23
1 files changed, 7 insertions, 16 deletions
diff --git a/project/build/BasicLayer.scala b/project/build/BasicLayer.scala
index 084fcf3072..b8f66c12eb 100644
--- a/project/build/BasicLayer.scala
+++ b/project/build/BasicLayer.scala
@@ -1,6 +1,5 @@
import sbt._
import xsbt.{ScalaInstance}
-import BasicLayer._
import ScalaBuildProject._
import scala.collection.immutable.{EmptyMap}
@@ -19,6 +18,7 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou
def buildInfoEnvironmentLocation:Path=outputRootPath / ("build-"+name+".properties")
+ override def watchPaths = info.projectPath / "src" ** ("*.scala" || "*.java"|| AdditionalResources.basicFilter) // Support of triggered execution at project level
override def dependencies = info.dependencies
@@ -66,7 +66,7 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou
def cleaningList=layerOutput::layerEnvironment.envBackingPath::packingDestination::Nil
- lazy val cleanFiles = FileUtilities.clean(cleaningList,true,log)
+ def cleanFiles = FileUtilities.clean(cleaningList,true,log)
lazy val clean:Task = nextLayer match {
case None => super.task{ cleanFiles}// We use super.task, so cleaning is done in every case, even when locked
@@ -74,6 +74,11 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou
}
+ lazy val cleanBuild = task{
+ cleanFiles orElse buildLayer
+ }.dependsOn(startLayer)
+
+
@@ -263,13 +268,6 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou
-
- //Needed Libraries
- //TODO Check if not possible to manage some of them with the sbt dependency management (ivy)
-
-
-
-
//Paths location that must be defined layer by layer
/*
* We must define which are the libraries used to instantiate the compiler
@@ -281,10 +279,3 @@ abstract class BasicLayer(val info:ProjectInfo,val versionNumber:String, previou
}
-
-object BasicLayer{
- implicit def stringToGlob(s:String):NameFilter=GlobFilter(s)
-
-
-
-}