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

fix managed resource directory location

This commit is contained in:
Mark Harrah 2011-05-16 22:56:07 -04:00
parent ec2df78526
commit 49e4b11e23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
main/Defaults.scala
View File

@ -26,7 +26,7 @@ package sbt
object Defaults extends BuildCommon object Defaults extends BuildCommon
{ {
def configSrcSub(key: ScopedSetting[File]): Initialize[File] = (key, configuration) { (src, conf) => src / nameForSrc(conf.name) } def configSrcSub(key: ScopedSetting[File]): Initialize[File] = (key in ThisScope.copy(config = Global), configuration) { (src, conf) => src / nameForSrc(conf.name) }
def nameForSrc(config: String) = if(config == "compile") "main" else config def nameForSrc(config: String) = if(config == "compile") "main" else config
def prefix(config: String) = if(config == "compile") "" else config + "-" def prefix(config: String) = if(config == "compile") "" else config + "-"
@ -62,8 +62,6 @@ object Defaults extends BuildCommon
fork :== false, fork :== false,
javaOptions :== Nil, javaOptions :== Nil,
sbtPlugin :== false, sbtPlugin :== false,
sourceGenerators :== Nil,
resourceGenerators :== Nil,
crossPaths :== true, crossPaths :== true,
classpathTypes := Set("jar", "bundle"), classpathTypes := Set("jar", "bundle"),
aggregate :== Aggregation.Enabled, aggregate :== Aggregation.Enabled,
@ -96,12 +94,13 @@ object Defaults extends BuildCommon
sourceDirectory <<= baseDirectory / "src", sourceDirectory <<= baseDirectory / "src",
sourceFilter in GlobalScope :== ("*.java" | "*.scala"), sourceFilter in GlobalScope :== ("*.java" | "*.scala"),
sourceManaged <<= crossTarget / "src_managed", sourceManaged <<= crossTarget / "src_managed",
resourceManaged <<= crossTarget / "resource_managed",
cacheDirectory <<= target / "cache" cacheDirectory <<= target / "cache"
) )
lazy val configPaths = sourceConfigPaths ++ resourceConfigPaths ++ outputConfigPaths lazy val configPaths = sourceConfigPaths ++ resourceConfigPaths ++ outputConfigPaths
lazy val sourceConfigPaths = Seq( lazy val sourceConfigPaths = Seq(
sourceDirectory <<= configSrcSub( sourceDirectory in Scope(This,Global,This,This) ), sourceDirectory <<= configSrcSub( sourceDirectory),
sourceManaged <<= configSrcSub(sourceManaged), sourceManaged <<= configSrcSub(sourceManaged),
scalaSource <<= sourceDirectory / "scala", scalaSource <<= sourceDirectory / "scala",
javaSource <<= sourceDirectory / "java", javaSource <<= sourceDirectory / "java",
@ -109,16 +108,18 @@ object Defaults extends BuildCommon
unmanagedSources <<= collectFiles(unmanagedSourceDirectories, sourceFilter, defaultExcludes in unmanagedSources), unmanagedSources <<= collectFiles(unmanagedSourceDirectories, sourceFilter, defaultExcludes in unmanagedSources),
managedSourceDirectories <<= Seq(sourceManaged).join, managedSourceDirectories <<= Seq(sourceManaged).join,
managedSources <<= generate(sourceGenerators), managedSources <<= generate(sourceGenerators),
sourceGenerators :== Nil,
sourceDirectories <<= Classpaths.concatSettings(unmanagedSourceDirectories, managedSourceDirectories), sourceDirectories <<= Classpaths.concatSettings(unmanagedSourceDirectories, managedSourceDirectories),
sources <<= Classpaths.concat(unmanagedSources, managedSources) sources <<= Classpaths.concat(unmanagedSources, managedSources)
) )
lazy val resourceConfigPaths = Seq( lazy val resourceConfigPaths = Seq(
resourceDirectory <<= sourceDirectory / "resources", resourceDirectory <<= sourceDirectory / "resources",
resourceManaged <<= sourceManaged / "res_managed", resourceManaged <<= configSrcSub(resourceManaged),
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 in unmanagedResources) map unmanagedResourcesTask, unmanagedResources <<= (unmanagedResourceDirectories, defaultExcludes in unmanagedResources) map unmanagedResourcesTask,
resourceGenerators :== Nil,
resourceGenerators <+= (definedSbtPlugins, resourceManaged) map writePluginsDescriptor, resourceGenerators <+= (definedSbtPlugins, resourceManaged) map writePluginsDescriptor,
managedResources <<= generate(resourceGenerators), managedResources <<= generate(resourceGenerators),
resources <<= Classpaths.concat(managedResources, unmanagedResources) resources <<= Classpaths.concat(managedResources, unmanagedResources)