diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-13 22:54:12 -0500 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-13 23:58:43 -0500 |
| commit | b8e3edf032c60e8c9ae4f28d5c3ac2e2720308cc (patch) | |
| tree | 859a6a25651a56ba92ec158fdb03f542d57202bd /stage2/BasicBuild.scala | |
| parent | e0fb6ec75286c695b7e4c5ed9189714d40f9b672 (diff) | |
| download | cbt-b8e3edf032c60e8c9ae4f28d5c3ac2e2720308cc.tar.gz cbt-b8e3edf032c60e8c9ae4f28d5c3ac2e2720308cc.tar.bz2 cbt-b8e3edf032c60e8c9ae4f28d5c3ac2e2720308cc.zip | |
easier setting of projectDirectory in sub-builds
by replacing context.projectDirectory by workingDirectory and using
it as the default but allowing it to being overridden
Diffstat (limited to 'stage2/BasicBuild.scala')
| -rw-r--r-- | stage2/BasicBuild.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index b7b0854..a2c7238 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -21,7 +21,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge // ========== general stuff ========== def enableConcurrency = false - final def projectDirectory: File = lib.realpath(context.projectDirectory) + def projectDirectory: File = lib.realpath(context.workingDirectory) assert( projectDirectory.exists, "projectDirectory does not exist: " ++ projectDirectory.string ) assert( projectDirectory.getName =!= "build" || @@ -107,7 +107,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge ) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion ) final def DirectoryDependency(path: File) = cbt.DirectoryDependency( - context.copy( projectDirectory = path, args = Seq() ) + context.copy( workingDirectory = path, args = Seq() ) ) def triggerLoopFiles: Seq[File] = sources ++ transitiveDependencies.collect{ case b: TriggerLoop => b.triggerLoopFiles }.flatten |