diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-08 19:41:36 -0500 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-03-08 20:09:00 -0500 |
commit | 1cac1cae6f48664188e3306eda70ce36fa2a5c0b (patch) | |
tree | 3265b3d9fc14142513b8eeafd2fe99cf94c4a4de /stage2/BasicBuild.scala | |
parent | 4518812fc211fde2ad9ab63ca72772fbb11fa6bc (diff) | |
download | cbt-1cac1cae6f48664188e3306eda70ce36fa2a5c0b.tar.gz cbt-1cac1cae6f48664188e3306eda70ce36fa2a5c0b.tar.bz2 cbt-1cac1cae6f48664188e3306eda70ce36fa2a5c0b.zip |
normalize Build's projectDirectory and stop using context.cwd
Diffstat (limited to 'stage2/BasicBuild.scala')
-rw-r--r-- | stage2/BasicBuild.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stage2/BasicBuild.scala b/stage2/BasicBuild.scala index 6da31b7..c17bce0 100644 --- a/stage2/BasicBuild.scala +++ b/stage2/BasicBuild.scala @@ -24,7 +24,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop{ // ========== general stuff ========== def enableConcurrency = false - final def projectDirectory: File = context.cwd + final def projectDirectory: File = lib.realpath(context.cwd) assert( projectDirectory.exists, "projectDirectory does not exist: " ++ projectDirectory.string ) final def usage: Unit = new lib.ReflectBuild(this).usage /* @@ -151,7 +151,7 @@ class Build(val context: Context) extends Dependency with TriggerLoop{ context.logger.composition(">"*80) context.logger.composition("class " ++ this.getClass.toString) - context.logger.composition("dir " ++ context.cwd.string) + context.logger.composition("dir " ++ projectDirectory.string) context.logger.composition("sources " ++ sources.toList.mkString(" ")) context.logger.composition("target " ++ target.string) context.logger.composition("context " ++ context.toString) @@ -160,5 +160,5 @@ class Build(val context: Context) extends Dependency with TriggerLoop{ // ========== cbt internals ========== private[cbt] def finalBuild = this - override def show = this.getClass.getSimpleName ++ "(" ++ context.cwd.string ++ ")" + override def show = this.getClass.getSimpleName ++ "(" ++ projectDirectory.string ++ ")" } |