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

Merge pull request #7788 from Friendseeker/package-src

This commit is contained in:
eugene yokota 2024-10-20 09:15:32 -04:00 committed by GitHub
parent 16f93c543a 4b75c97f69
commit 3decafbf43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1832,11 +1832,11 @@ object Defaults extends BuildCommon {
def sourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] = def sourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] =
Def.task { Def.task {
val converter = fileConverter.value val converter = fileConverter.value
val sdirs = unmanagedSourceDirectories.value val sdirs = sourceDirectories.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 sources.value
.flatMap { .flatMap {
case s if !exclude(s) => relative(s).map(s -> _) case s if !exclude(s) => relative(s).map(s -> _)
case _ => None case _ => None
@ -1848,7 +1848,7 @@ object Defaults extends BuildCommon {
} }
def resourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] = def resourceMappings: Initialize[Task[Seq[(HashedVirtualFileRef, String)]]] =
relativeMappings(unmanagedResources, unmanagedResourceDirectories) relativeMappings(resources, resourceDirectories)
def relativeMappings( def relativeMappings(
files: Taskable[Seq[File]], files: Taskable[Seq[File]],