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

scope defaultExcludes uses by the referencing task

This commit is contained in:
Mark Harrah 2011-05-07 22:02:06 -04:00
parent c8fe1a3c1d
commit 6bd500bbe2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main/Defaults.scala
View File

@ -99,9 +99,9 @@ object Defaults
scalaSource <<= sourceDirectory / "scala", scalaSource <<= sourceDirectory / "scala",
javaSource <<= sourceDirectory / "java", javaSource <<= sourceDirectory / "java",
unmanagedSourceDirectories <<= Seq(scalaSource, javaSource).join, unmanagedSourceDirectories <<= Seq(scalaSource, javaSource).join,
unmanagedSources <<= collectFiles(unmanagedSourceDirectories, sourceFilter, defaultExcludes), unmanagedSources <<= collectFiles(unmanagedSourceDirectories, sourceFilter, defaultExcludes in unmanagedSources),
managedSourceDirectories :== Nil, managedSourceDirectories :== Nil,
managedSources <<= collectFiles(managedSourceDirectories, sourceFilter, defaultExcludes), managedSources <<= collectFiles(managedSourceDirectories, sourceFilter, defaultExcludes in managedSources),
sources <<= Classpaths.concat(unmanagedSources, managedSources) sources <<= Classpaths.concat(unmanagedSources, managedSources)
) )
lazy val resourceConfigPaths = Seq( lazy val resourceConfigPaths = Seq(
@ -110,7 +110,7 @@ object Defaults
unmanagedResourceDirectories <<= Seq(resourceDirectory).join, unmanagedResourceDirectories <<= Seq(resourceDirectory).join,
managedResourceDirectories <<= Seq(resourceManaged).join, managedResourceDirectories <<= Seq(resourceManaged).join,
resourceDirectories <<= Classpaths.concatSettings(unmanagedResourceDirectories, managedResourceDirectories), resourceDirectories <<= Classpaths.concatSettings(unmanagedResourceDirectories, managedResourceDirectories),
unmanagedResources <<= (unmanagedResourceDirectories, defaultExcludes) map unmanagedResourcesTask, unmanagedResources <<= (unmanagedResourceDirectories, defaultExcludes in unmanagedResources) map unmanagedResourcesTask,
managedResources <<= (definedSbtPlugins, resourceManaged) map writePluginsDescriptor, managedResources <<= (definedSbtPlugins, resourceManaged) map writePluginsDescriptor,
resources <<= Classpaths.concat(managedResources, unmanagedResources) resources <<= Classpaths.concat(managedResources, unmanagedResources)
) )
@ -120,7 +120,7 @@ object Defaults
docDirectory <<= (crossTarget, configuration) { (outDir, conf) => outDir / (prefix(conf.name) + "api") } docDirectory <<= (crossTarget, configuration) { (outDir, conf) => outDir / (prefix(conf.name) + "api") }
) )
def addBaseSources = Seq( def addBaseSources = Seq(
unmanagedSources <<= (unmanagedSources, baseDirectory, sourceFilter, defaultExcludes) map { unmanagedSources <<= (unmanagedSources, baseDirectory, sourceFilter, defaultExcludes in unmanagedSources) map {
(srcs,b,f,excl) => (srcs +++ b * (f -- excl)).getFiles (srcs,b,f,excl) => (srcs +++ b * (f -- excl)).getFiles
} }
) )
@ -494,7 +494,7 @@ object Classpaths
products <<= makeProducts, products <<= makeProducts,
classpathConfiguration <<= (internalConfigurationMap, configuration)( _ apply _ ), classpathConfiguration <<= (internalConfigurationMap, configuration)( _ apply _ ),
managedClasspath <<= (classpathConfiguration, classpathTypes, update) map managedJars, managedClasspath <<= (classpathConfiguration, classpathTypes, update) map managedJars,
unmanagedJars <<= (configuration, unmanagedBase, classpathFilter, defaultExcludes) map { (config, base, filter, excl) => unmanagedJars <<= (configuration, unmanagedBase, classpathFilter, defaultExcludes in unmanagedJars) map { (config, base, filter, excl) =>
(base * (filter -- excl) +++ (base / config.name).descendentsExcept(filter, excl)).getFiles (base * (filter -- excl) +++ (base / config.name).descendentsExcept(filter, excl)).getFiles
} }
) )