aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohannes Rudolph <johannes.rudolph@gmail.com>2013-10-24 00:07:51 +0200
committerJohannes Rudolph <johannes.rudolph@gmail.com>2013-10-24 00:07:51 +0200
commit7ca90e2bae7f0ea5d441b93ace59e807e53084d9 (patch)
treef6c94d5fd94eddf14b1b518917001521a0cd0809 /src
parentbd1a8a0c20996489e4f723a35b640562edf4b5df (diff)
parent40ab6337c2f84d85a80d150bf55f9e8a202adcc6 (diff)
downloadsbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.tar.gz
sbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.tar.bz2
sbt-boilerplate-7ca90e2bae7f0ea5d441b93ace59e807e53084d9.zip
Merge branch '0.5.1'
Diffstat (limited to 'src')
-rw-r--r--src/main/scala/spray/boilerplate/BoilerplatePlugin.scala5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
index 6049c98..149192c 100644
--- a/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
+++ b/src/main/scala/spray/boilerplate/BoilerplatePlugin.scala
@@ -38,7 +38,7 @@ object BoilerplatePlugin extends Plugin {
def watch(sourceDirKey: SettingKey[File], filterKey: SettingKey[FileFilter], excludeKey: SettingKey[FileFilter]) =
watchSources <++= (sourceDirKey, filterKey, excludeKey) map descendents
def descendents(sourceDir: File, filt: FileFilter, excl: FileFilter) =
- sourceDir.descendentsExcept(filt, excl).get
+ descendantsExcept(sourceDir, filt, excl).get
def generateFromTemplates(streams: TaskStreams, sourceDir: File, targetDir: File): Seq[File] = {
val files = sourceDir ** "*.template"
@@ -65,4 +65,7 @@ object BoilerplatePlugin extends Plugin {
mapping.map(_._2)
}
}
+
+ def descendantsExcept(path: PathFinder, include: FileFilter, intermediateExclude: FileFilter): PathFinder =
+ (path ** include) --- (path ** intermediateExclude ** include)
}