From 6c277e29cb75656a6340aafc7855029ea9c4d3ca Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Sun, 19 Jun 2016 22:19:05 -0400 Subject: work correctly in the presence of empty build folders --- stage2/BuildBuild.scala | 6 +++++- test/empty-build/Main.scala | 5 +++++ test/empty-build/build/build/dummy | 0 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 test/empty-build/Main.scala create mode 100644 test/empty-build/build/build/dummy 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 -- cgit v1.2.3