sourcesInBase setting. fixes #494

This commit is contained in:
Mark Harrah 2012-07-06 10:28:51 -04:00
parent 8843458291
commit 464193d0f6
4 changed files with 8 additions and 2 deletions

View File

@ -70,6 +70,7 @@ object Defaults extends BuildCommon
logBuffered :== false,
connectInput :== false,
cancelable :== false,
sourcesInBase :== true,
autoScalaLibrary :== true,
onLoad <<= onLoad ?? idFun[State],
onUnload <<= (onUnload ?? idFun[State]),
@ -182,8 +183,8 @@ object Defaults extends BuildCommon
docDirectory <<= (crossTarget, configuration) { (outDir, conf) => outDir / (prefix(conf.name) + "api") }
)
def addBaseSources = Seq(
unmanagedSources <<= (unmanagedSources, baseDirectory, includeFilter in unmanagedSources, excludeFilter in unmanagedSources) map {
(srcs,b,f,excl) => (srcs +++ b * (f -- excl)).get
unmanagedSources <<= (unmanagedSources, baseDirectory, includeFilter in unmanagedSources, excludeFilter in unmanagedSources, sourcesInBase) map {
(srcs,b,f,excl,enable) => if(enable) (srcs +++ b * (f -- excl)).get else srcs
}
)

View File

@ -88,6 +88,7 @@ object Keys
val managedSourceDirectories = SettingKey[Seq[File]]("managed-source-directories", "Managed source directories, which contain sources generated by the build.", BSetting)
val managedSources = TaskKey[Seq[File]]("managed-sources", "Sources generated by the build.", BTask)
val sources = TaskKey[Seq[File]]("sources", "All sources, both managed and unmanaged.", BTask)
val sourcesInBase = SettingKey[Boolean]("sources-in-base", "If true, sources from the project's base directory are included as main sources.")
// Filters
val includeFilter = SettingKey[FileFilter]("include-filter", "Filter for including sources and resources files from default directories.", CSetting)

View File

@ -0,0 +1 @@
invalid

View File

@ -0,0 +1,3 @@
-> compile
> set sourcesInBase := false
> compile