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

Include managedSources in packageSrc

This commit is contained in:
friendseeker 2024-01-01 18:25:13 -08:00 committed by Jerry Tan
parent 4151f4e6c0
commit e4ab56e444
1 changed files with 2 additions and 2 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

@ -1719,11 +1719,11 @@ object Defaults extends BuildCommon {
// drop base directories, since there are no valid mappings for these // drop base directories, since there are no valid mappings for these
def sourceMappings: Initialize[Task[Seq[(File, String)]]] = def sourceMappings: Initialize[Task[Seq[(File, String)]]] =
Def.task { Def.task {
val sdirs = unmanagedSourceDirectories.value val sdirs = unmanagedSourceDirectories.value ++ managedSourceDirectories.value
val base = baseDirectory.value val base = baseDirectory.value
val relative = (f: File) => relativeTo(sdirs)(f).orElse(relativeTo(base)(f)).orElse(flat(f)) val relative = (f: File) => relativeTo(sdirs)(f).orElse(relativeTo(base)(f)).orElse(flat(f))
val exclude = Set(sdirs, base) val exclude = Set(sdirs, base)
unmanagedSources.value.flatMap { (unmanagedSources.value ++ managedSources.value).flatMap {
case s if !exclude(s) => relative(s).map(s -> _) case s if !exclude(s) => relative(s).map(s -> _)
case _ => None case _ => None
} }