diff options
| author | Jan Christopher Vogt <oss.nsp@cvogt.org> | 2017-02-15 10:59:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-15 10:59:12 -0500 |
| commit | 86552d373be1b2fbf3e11d1ed223ebc4bdb6b280 (patch) | |
| tree | 7c1210bfcae6a64d82eefcc9cb5c74bc8280c307 | |
| parent | 7ad65aeafc9d4fc9e0102c7d2ee8c9a31bd0be74 (diff) | |
| parent | f94f18869efabb533d78844ee527cb4293b3bb4e (diff) | |
| download | cbt-86552d373be1b2fbf3e11d1ed223ebc4bdb6b280.tar.gz cbt-86552d373be1b2fbf3e11d1ed223ebc4bdb6b280.tar.bz2 cbt-86552d373be1b2fbf3e11d1ed223ebc4bdb6b280.zip | |
Merge pull request #347 from cvogt/chris3
various changes
| -rw-r--r-- | stage1/cbt.scala | 2 | ||||
| -rw-r--r-- | stage2/Lib.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/stage1/cbt.scala b/stage1/cbt.scala index f88ef16..4caa085 100644 --- a/stage1/cbt.scala +++ b/stage1/cbt.scala @@ -25,7 +25,7 @@ object `package`{ ) new File( file.toString ++ s ) } - def /(s: String): File = new File(file.getAbsolutePath + File.separator + s) + def /(s: String): File = new File( file, s ) def parent = lib.realpath(file ++ "/..") def string = file.toString } diff --git a/stage2/Lib.scala b/stage2/Lib.scala index fc53c4f..b7d1686 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -30,7 +30,7 @@ final class Lib(val logger: Logger) extends Stage1Lib(logger){ def loadRoot(context: Context): BuildInterface = { val directory = context.workingDirectory - context.logger.composition( context.logger.showInvocation("Build.loadRoot",directory) ) + context.logger.composition( context.logger.showInvocation("Lib.loadRoot",directory) ) val start = lib.findInnerMostModuleDirectory(directory) |