diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-27 20:13:56 +0800 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-27 20:13:56 +0800 |
| commit | 7db4ee8ccde8af044c5a6cae33d35492887571a3 (patch) | |
| tree | 46e12cfcdcf65fba53a10cb0b38fbbb273fe1ad5 /stage2 | |
| parent | c92396090ee3ccb05b616f691c85e2c01ed614a5 (diff) | |
| download | cbt-7db4ee8ccde8af044c5a6cae33d35492887571a3.tar.gz cbt-7db4ee8ccde8af044c5a6cae33d35492887571a3.tar.bz2 cbt-7db4ee8ccde8af044c5a6cae33d35492887571a3.zip | |
move default sourceFileFilter into lib for less OO coupling
Diffstat (limited to 'stage2')
| -rw-r--r-- | stage2/BasicBuild.scala | 2 | ||||
| -rw-r--r-- | stage2/Lib.scala | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index f7f54a3..b5bca6a 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -85,7 +85,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge def sources: Seq[File] = Seq(defaultSourceDirectory) ++ projectDirectory.listFiles.toVector.filter(sourceFileFilter) /** Which file endings to consider being source files. */ - def sourceFileFilter(file: File): Boolean = file.toString.endsWith(".scala") || file.toString.endsWith(".java") + def sourceFileFilter(file: File) = lib.sourceFileFilter(file) /** Absolute path names for all individual files found in sources directly or contained in directories. */ final def sourceFiles: Seq[File] = lib.sourceFiles(sources, sourceFileFilter) diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 854a50a..33bfe1a 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -285,7 +285,10 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ def dirname(path: File): File = new File(realpath(path).string.stripSuffix("/").split("/").dropRight(1).mkString("/")) def nameAndContents(file: File) = basename(file) -> readAllBytes(file.toPath) - def sourceFiles( sources: Seq[File], sourceFileFilter: File => Boolean ): Seq[File] = { + /** Which file endings to consider being source files. */ + def sourceFileFilter(file: File): Boolean = file.toString.endsWith(".scala") || file.toString.endsWith(".java") + + def sourceFiles( sources: Seq[File], sourceFileFilter: File => Boolean = sourceFileFilter ): Seq[File] = { for { base <- sources.filter(_.exists).map(lib.realpath) file <- base.listRecursive if file.isFile && sourceFileFilter(file) |