aboutsummaryrefslogtreecommitdiff
path: root/stage2/GitDependency.scala
diff options
context:
space:
mode:
authorChristopher Vogt <oss.nsp@cvogt.org>2017-02-13 22:54:12 -0500
committerChristopher Vogt <oss.nsp@cvogt.org>2017-02-13 23:58:43 -0500
commitb8e3edf032c60e8c9ae4f28d5c3ac2e2720308cc (patch)
tree859a6a25651a56ba92ec158fdb03f542d57202bd /stage2/GitDependency.scala
parente0fb6ec75286c695b7e4c5ed9189714d40f9b672 (diff)
downloadcbt-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/GitDependency.scala')
-rw-r--r--stage2/GitDependency.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/GitDependency.scala b/stage2/GitDependency.scala
index 059d650..754e41a 100644
--- a/stage2/GitDependency.scala
+++ b/stage2/GitDependency.scala
@@ -21,7 +21,7 @@ case class GitDependency(
// See http://www.codeaffine.com/2014/12/09/jgit-authentication/
private val GitUrl( _, domain, path ) = url
- private val credentialsFile = context.projectDirectory ++ "/git.login"
+ private val credentialsFile = context.workingDirectory ++ "/git.login"
private def authenticate(_git: CloneCommand) =
if(!credentialsFile.exists){
@@ -67,7 +67,7 @@ case class GitDependency(
def dependency = taskCache[GitDependency]("dependency").memoize{
DirectoryDependency(
context.copy(
- projectDirectory = checkout ++ subDirectory.map("/" ++ _).getOrElse("")
+ workingDirectory = checkout ++ subDirectory.map("/" ++ _).getOrElse("")
)
)
}