diff options
| author | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-18 01:21:36 +0000 |
|---|---|---|
| committer | Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-18 01:21:36 +0000 |
| commit | c9d6afb6f139e7dd4dbe3b1e474f4383570b5ff7 (patch) | |
| tree | 85928ef0176ddb7901f0b4c7ca3779b96e26ed27 /stage2/BasicBuild.scala | |
| parent | 3c135b40c2d2aac017ac12edc6924e3c369296fd (diff) | |
| download | cbt-c9d6afb6f139e7dd4dbe3b1e474f4383570b5ff7.tar.gz cbt-c9d6afb6f139e7dd4dbe3b1e474f4383570b5ff7.tar.bz2 cbt-c9d6afb6f139e7dd4dbe3b1e474f4383570b5ff7.zip | |
support DirectoryDependency on sub builds of a multi project builds
Diffstat (limited to 'stage2/BasicBuild.scala')
| -rw-r--r-- | stage2/BasicBuild.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index c1a8c4e..5c49395 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -106,8 +106,9 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge scalaVersion: String = scalaMajorVersion ) = lib.ScalaDependency( groupId, artifactId, version, classifier, scalaVersion ) - final def DirectoryDependency(path: File) = cbt.DirectoryDependency( - context.copy( workingDirectory = path, args = Seq() ) + final def DirectoryDependency(path: File, pathToNestedBuild: String*) = cbt.DirectoryDependency( + context.copy( workingDirectory = path ), + pathToNestedBuild: _* ) def triggerLoopFiles: Seq[File] = sources ++ transitiveDependencies.collect{ case b: TriggerLoop => b.triggerLoopFiles }.flatten @@ -187,7 +188,7 @@ trait BaseBuild extends BuildInterface with DependencyImplementation with Trigge def test: Any = lib.callReflective( - DirectoryDependency(projectDirectory++"/test").build, + DirectoryDependency(projectDirectory++"/test").dependency, Some("run") ) |