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

cleanup some sequencing settings in Defaults

This commit is contained in:
Mark Harrah 2011-04-09 19:58:49 -04:00
parent ff7b5138c5
commit 8d06ba2d92
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/Defaults.scala
View File

@ -48,7 +48,6 @@ object Defaults
def configSrcSub(key: ScopedSetting[File]): Initialize[File] = (key, configuration) { (src, conf) => src / nameForSrc(conf.name) } def configSrcSub(key: ScopedSetting[File]): Initialize[File] = (key, configuration) { (src, conf) => src / nameForSrc(conf.name) }
def nameForSrc(config: String) = if(config == "compile") "main" else config def nameForSrc(config: String) = if(config == "compile") "main" else config
def prefix(config: String) = if(config == "compile") "" else config + "-" def prefix(config: String) = if(config == "compile") "" else config + "-"
def toSeq[T](key: ScopedSetting[T]): Initialize[Seq[T]] = key( _ :: Nil)
def extractAnalysis[T](a: Attributed[T]): (T, inc.Analysis) = def extractAnalysis[T](a: Attributed[T]): (T, inc.Analysis) =
(a.data, a.metadata get Keys.analysis getOrElse inc.Analysis.Empty) (a.data, a.metadata get Keys.analysis getOrElse inc.Analysis.Empty)
@ -109,8 +108,8 @@ object Defaults
javaSource <<= sourceDirectory / "java", javaSource <<= sourceDirectory / "java",
resourceDirectory <<= sourceDirectory / "resources", resourceDirectory <<= sourceDirectory / "resources",
generatedResourceDirectory <<= target / "res_managed", generatedResourceDirectory <<= target / "res_managed",
sourceDirectories <<= (scalaSource, javaSource) { _ :: _ :: Nil }, sourceDirectories <<= Seq(scalaSource, javaSource).join,
resourceDirectories <<= (resourceDirectory, generatedResourceDirectory) { _ :: _ :: Nil }, resourceDirectories <<= Seq(resourceDirectory, generatedResourceDirectory).join,
resources <<= (resourceDirectories, defaultExcludes, generatedResources, generatedResourceDirectory) map resourcesTask, resources <<= (resourceDirectories, defaultExcludes, generatedResources, generatedResourceDirectory) map resourcesTask,
generatedResources <<= (definedSbtPlugins, generatedResourceDirectory) map writePluginsDescriptor generatedResources <<= (definedSbtPlugins, generatedResourceDirectory) map writePluginsDescriptor
) )
@ -149,7 +148,7 @@ object Defaults
) )
lazy val projectTasks: Seq[Setting[_]] = Seq( lazy val projectTasks: Seq[Setting[_]] = Seq(
cleanFiles <<= (target, sourceManaged) { _ :: _ :: Nil }, cleanFiles <<= Seq(target, sourceManaged).join,
clean <<= cleanFiles map IO.delete, clean <<= cleanFiles map IO.delete,
consoleProject <<= consoleProjectTask, consoleProject <<= consoleProjectTask,
watchSources <<= watchSourcesTask, watchSources <<= watchSourcesTask,