aboutsummaryrefslogtreecommitdiff
path: root/stage2/BuildDependency.scala
diff options
context:
space:
mode:
authorJan Christopher Vogt <oss.nsp@cvogt.org>2016-06-19 16:31:47 -0400
committerGitHub <noreply@github.com>2016-06-19 16:31:47 -0400
commitbb856040475cc15fe0754a52428375bd36f8b782 (patch)
tree3fe563f8596b49a136e12dfd693f7b21c0afc90d /stage2/BuildDependency.scala
parent9596983505f1e0d2e4c582e1c23f04e35b42fde1 (diff)
parent32691b7908150970344a5c3a5c58fef9dec0a6ac (diff)
downloadcbt-bb856040475cc15fe0754a52428375bd36f8b782.tar.gz
cbt-bb856040475cc15fe0754a52428375bd36f8b782.tar.bz2
cbt-bb856040475cc15fe0754a52428375bd36f8b782.zip
Merge pull request #150 from cvogt/chris2
various changes
Diffstat (limited to 'stage2/BuildDependency.scala')
-rw-r--r--stage2/BuildDependency.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/stage2/BuildDependency.scala b/stage2/BuildDependency.scala
index aba35c6..c0b53ad 100644
--- a/stage2/BuildDependency.scala
+++ b/stage2/BuildDependency.scala
@@ -15,7 +15,7 @@ trait TriggerLoop extends DependencyImplementation{
def triggerLoopFiles: Seq[File]
}
/** You likely want to use the factory method in the BasicBuild class instead of this. */
-case class BuildDependency(context: Context) extends TriggerLoop{
+case class DirectoryDependency(context: Context) extends TriggerLoop{
override def show = this.getClass.getSimpleName ++ "(" ++ context.projectDirectory.string ++ ")"
final override lazy val logger = context.logger
final override lazy val lib: Lib = new Lib(logger)
@@ -28,7 +28,7 @@ case class BuildDependency(context: Context) extends TriggerLoop{
def targetClasspath = ClassPath()
}
/*
-case class DependencyOr(first: BuildDependency, second: JavaDependency) extends ProjectProxy with BuildDependencyBase{
+case class DependencyOr(first: DirectoryDependency, second: JavaDependency) extends ProjectProxy with DirectoryDependencyBase{
val isFirst = new File(first.context.projectDirectory).exists
def triggerLoopFiles = if(isFirst) first.triggerLoopFiles else Seq()
protected val delegate = if(isFirst) first else second