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

Include base directory to watched sources 

If `sourcesInBase` is true, we must also watch sources in the base
directory.
This commit is contained in:
Martin Duhem 2017-08-14 15:45:40 +02:00
parent ec54269467
commit c395f1d464
No known key found for this signature in database
GPG Key ID: CC9CE9656E10C555
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -316,7 +316,9 @@ object Defaults extends BuildCommon {
includeFilter in unmanagedSources, includeFilter in unmanagedSources,
excludeFilter in unmanagedSources).value, excludeFilter in unmanagedSources).value,
watchSources in ConfigGlobal ++= { watchSources in ConfigGlobal ++= {
val bases = unmanagedSourceDirectories.value val baseDir = baseDirectory.value
val bases = unmanagedSourceDirectories.value ++ (if (sourcesInBase.value) Seq(baseDir)
else Seq.empty)
val include = (includeFilter in unmanagedSources).value val include = (includeFilter in unmanagedSources).value
val exclude = (excludeFilter in unmanagedSources).value val exclude = (excludeFilter in unmanagedSources).value
bases.map(b => new Source(b, include, exclude)) bases.map(b => new Source(b, include, exclude))