From c6fd3f43a9d2b2f38442602769e920803a7d43ba Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sat, 4 Mar 2017 03:02:04 +0000 Subject: separate type-safe proguard wrapper into self-contained library also make logic to maintain auto-generated sections re-usable --- stage2/BasicBuild.scala | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'stage2/BasicBuild.scala') diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index b6a2870..910cd5e 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -13,8 +13,10 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge implicit def transientCache: java.util.Map[AnyRef,AnyRef] = context.transientCache object libraries{ - def eval = DirectoryDependency( context.cbtHome ++ "/libraries/eval" ) - def captureArgs = DirectoryDependency( context.cbtHome ++ "/libraries/capture_args" ) + private def dep(name: String) = DirectoryDependency( context.cbtHome / "libraries" / name ) + def captureArgs = dep( "capture_args" ) + def eval = dep( "eval" ) + def proguard = dep( "proguard" ) } // library available to builds @@ -86,8 +88,13 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge */ def compileStatusFile: File = compileTarget ++ ".last-success" + def generatedSources: Seq[File] = Seq( projectDirectory / "src_generated" ) /** Source directories and files. Defaults to .scala and .java files in src/ and top-level. */ - def sources: Seq[File] = Seq(defaultSourceDirectory) ++ projectDirectory.listFiles.toVector.filter(sourceFileFilter) + def sources: Seq[File] = ( + Seq(defaultSourceDirectory) + ++ generatedSources + ++ projectDirectory.listFiles.toVector.filter(sourceFileFilter) + ) /** Which file endings to consider being source files. */ def sourceFileFilter(file: File) = lib.sourceFileFilter(file) -- cgit v1.2.3