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

disable aggregation by default for the interactive tasks

This commit is contained in:
Mark Harrah 2011-02-21 10:07:58 -05:00
parent 218ccc2c9f
commit ea1e7d6cae
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
main/Default.scala
View File

@ -61,6 +61,7 @@ object Keys
val DocTask = TaskKey[File]("doc") val DocTask = TaskKey[File]("doc")
val CopyResources = TaskKey[Traversable[(File,File)]]("copy-resources") val CopyResources = TaskKey[Traversable[(File,File)]]("copy-resources")
val Resources = TaskKey[Seq[File]]("resources") val Resources = TaskKey[Seq[File]]("resources")
val Aggregate = SettingKey[Aggregation]("aggregate")
// package keys // package keys
val Package = TaskKey[sbt.Package.Configuration]("package") val Package = TaskKey[sbt.Package.Configuration]("package")
@ -200,6 +201,7 @@ object Default
def data[T](in: Seq[Attributed[T]]): Seq[T] = in.map(_.data) def data[T](in: Seq[Attributed[T]]): Seq[T] = in.map(_.data)
def core = Seq( def core = Seq(
Aggregate in GlobalScope :== Aggregation.Enabled,
Name <<= ThisProject(_.id), Name <<= ThisProject(_.id),
Version :== "0.1", Version :== "0.1",
MaxErrors in GlobalScope :== 100, MaxErrors in GlobalScope :== 100,
@ -435,6 +437,11 @@ object Default
lazy val defaultPaths = paths ++ inConfig(CompileConf)(configPaths ++ addBaseSources) ++ inConfig(TestConf)(configPaths) lazy val defaultPaths = paths ++ inConfig(CompileConf)(configPaths ++ addBaseSources) ++ inConfig(TestConf)(configPaths)
lazy val defaultWebPaths = defaultPaths ++ inConfig(CompileConf)(webPaths) lazy val defaultWebPaths = defaultPaths ++ inConfig(CompileConf)(webPaths)
def noAggregation = Seq(RunTask, ConsoleTask, ConsoleQuick)
lazy val disableAggregation = noAggregation map disableAggregate
def disableAggregate(k: Scoped) =
Aggregate in Scope.GlobalScope.copy(task = Select(k.key)) :== false
lazy val defaultTasks = lazy val defaultTasks =
projectTasks ++ projectTasks ++
inConfig(CompileConf)(configTasks :+ mainRunTask) ++ inConfig(CompileConf)(configTasks :+ mainRunTask) ++
@ -453,7 +460,7 @@ object Default
inConfig(TestConf)(Classpaths.configSettings) inConfig(TestConf)(Classpaths.configSettings)
lazy val defaultSettings = core ++ defaultPaths ++ defaultClasspaths ++ defaultTasks ++ compileBase ++ pluginDefinition lazy val defaultSettings = core ++ defaultPaths ++ defaultClasspaths ++ defaultTasks ++ compileBase ++ disableAggregation ++ pluginDefinition
lazy val defaultWebSettings = defaultSettings ++ defaultWebPaths ++ defaultWebTasks lazy val defaultWebSettings = defaultSettings ++ defaultWebPaths ++ defaultWebTasks
} }
object Classpaths object Classpaths