diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-06-19 22:19:05 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-09-12 15:25:32 +0100 |
commit | 6c277e29cb75656a6340aafc7855029ea9c4d3ca (patch) | |
tree | bc80711269f9d01438056a6d8f43461cf07a6d35 | |
parent | 4c889aedae5108cc8d381e9876c1ae956ff078f2 (diff) | |
download | cbt-6c277e29cb75656a6340aafc7855029ea9c4d3ca.tar.gz cbt-6c277e29cb75656a6340aafc7855029ea9c4d3ca.tar.bz2 cbt-6c277e29cb75656a6340aafc7855029ea9c4d3ca.zip |
work correctly in the presence of empty build folders
-rw-r--r-- | stage2/BuildBuild.scala | 6 | ||||
-rw-r--r-- | test/empty-build/Main.scala | 5 | ||||
-rw-r--r-- | test/empty-build/build/build/dummy | 0 |
3 files changed, 10 insertions, 1 deletions
diff --git a/stage2/BuildBuild.scala b/stage2/BuildBuild.scala index 5392217..b6d92c4 100644 --- a/stage2/BuildBuild.scala +++ b/stage2/BuildBuild.scala @@ -58,7 +58,11 @@ trait BuildBuild extends BaseBuild{ } } } else { - new BasicBuild(managedContext) + if( projectDirectory.getParentFile.getName == "build" ){ + new BasicBuild( managedContext ) with BuildBuild + } else { + new BasicBuild( managedContext ) + } } ) try{ diff --git a/test/empty-build/Main.scala b/test/empty-build/Main.scala new file mode 100644 index 0000000..19d4beb --- /dev/null +++ b/test/empty-build/Main.scala @@ -0,0 +1,5 @@ +object Main{ + def main( args: Array[String] ): Unit = { + println( Console.GREEN ++ "Hello World" ++ Console.RESET ) + } +} diff --git a/test/empty-build/build/build/dummy b/test/empty-build/build/build/dummy new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/test/empty-build/build/build/dummy |