luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove 'Empty' task

This commit is contained in:
Mark Harrah 2010-05-30 17:01:41 -04:00
parent 7fa3a7df31
commit e0275c2d59
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sbt/src/main/scala/sbt/DefaultProject.scala
View File

@ -301,7 +301,7 @@ abstract class BasicScalaProject extends ScalaProject with BasicDependencyProjec
protected def packageProjectAction = zipTask(packageProjectPaths, packageProjectZip) describedAs ProjectPackageDescription
protected def docAllAction = (doc && docTest) describedAs DocAllDescription
protected def packageAllAction = Empty dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
protected def packageAllAction = task { None} dependsOn(`package`, packageTest, packageSrc, packageTestSrc, packageDocs) describedAs PackageAllDescription
protected def graphSourcesAction = graphSourcesTask(graphSourcesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
protected def graphPackagesAction = graphPackagesTask(graphPackagesPath, mainSourceRoots, mainCompileConditional.analysis).dependsOn(compile)
protected def incrementVersionAction = task { incrementVersionNumber(); None } describedAs IncrementVersionDescription

4
sbt/src/main/scala/sbt/ScalaProject.scala
View File

@ -174,8 +174,8 @@ trait ScalaProject extends SimpleScalaProject with FileTasks with MultiTaskProje
val beginTasks = begin.map(toTask).toSeq // test setup tasks
val workTasks = work.map(w => toTask(w) dependsOn(beginTasks : _*)) // the actual tests
val endTasks = end.map(toTask).toSeq // tasks that perform test cleanup and are run regardless of success of tests
val endTask = Empty named("test-cleanup") dependsOn(endTasks : _*)
val rootTask = Empty named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
val endTask = task { None} named("test-cleanup") dependsOn(endTasks : _*)
val rootTask = task { None} named("test-complete") dependsOn(workTasks.toSeq : _*) // the task that depends on all test subtasks
SubWork[Project#Task](rootTask, endTask)
}
def errorTask(e: TestSetupException) = task { Some(e.getMessage) } named("test-setup")

1
sbt/src/main/scala/sbt/TaskManager.scala
View File

@ -98,7 +98,6 @@ trait TaskManager{
val interactiveDependencyIndex = dependencyList.findIndexOf(_.interactive)
require(interactiveDependencyIndex < 0, "Dependency (at index " + interactiveDependencyIndex + ") is interactive. Interactive tasks cannot be dependencies.")
}
lazy val Empty = task { None}
}
object TaskManager
{