Cleanup file structure, upper case Build.scala

README.md

@@ -148,16 +148,16 @@ CBT can help you with that. Execute:
 $ cbt tools createBuild
 ```
 
-Now there should be a file `build/build.scala` with a sample `Build` class.
+Now there should be a file `cbt-build/Build.scala` with a sample `Build` class.
 
 Btw., a build file can have it's own build and so on recursively like in SBT.
-When you create a file `build/build/build.scala` and change `Build` class in there
-to extend `BuildBuild`, it will be used to build your `build/build.scala`. You can
+When you create a file `cbt-build/cbt-build/Build.scala` and change `Build` class in there
+to extend `BuildBuild`, it will be used to build your `cbt-build/Build.scala`. You can
 add built-time dependencies like plugins this way.
 
 ### Adding dependencies
 
-In the generated `build/build.scala` there are
+In the generated `cbt-build/Build.scala` there are
 several examples for dependencies. We recommend using the constructor syntax
 `ScalaDependency` (for automatically adding the scala version to the artifact id)
 or `MavenDependency` (for leaving the artifact id as is). The SBT-Style `%`-DSL
@@ -247,7 +247,7 @@ we would have two classes with the same name on the classpath which can be very
 Now that we have a Main file in our test project, we can add some assertions to it.
 In order for them to see the main projects code, we still need to do one more thing - 
 add a `DirectoryDependency` to your test project's build file. There is a similar example
-in the generated build.scala. What you need is this:
+in the generated `Build.scala`. What you need is this:
 
 ```
 override def dependencies = super.dependencies ++ Seq(

examples/dotty-example/README.md

@@ -1,3 +1,3 @@
 Dotty example project compiling hello world with the next version of Scala.
 
-All you need to do to enable Dotty is `extends Dotty` in your build.scala .
+All you need to do to enable Dotty is `extends Dotty` in your `Build.scala`.

stage2/BuildBuild.scala

@@ -23,7 +23,7 @@ trait BuildBuild extends BaseBuild{
   def managedBuildDirectory: java.io.File = lib.realpath( projectDirectory.parent )
   private object managedBuildCache extends Cache[BuildInterface]
   def managedBuild = managedBuildCache{
-    val managedBuildFile = projectDirectory++"/build.scala"
+    val managedBuildFile = projectDirectory++"/Build.scala"
     logger.composition("Loading build at "++managedContext.projectDirectory.toString)
     val build = (
       if(managedBuildFile.exists){
@@ -56,14 +56,14 @@ trait BuildBuild extends BaseBuild{
                 .newInstance(managedContext)
               } catch {
                 case e: ClassNotFoundException if e.getMessage == lib.buildClassName => 
-                  throw new Exception("You need to define a class Build in build.scala in: "+context.projectDirectory)
+                  throw new Exception("You need to define a class Build in Build.scala in: "+context.projectDirectory)
               }
           }
       } else if( projectDirectory.listFiles.exists( _.getName.endsWith(".scala") ) ){
         throw new Exception(
-          "No file build.scala (lower case) found in " ++ projectDirectory.getPath
+          "No file Build.scala (upper case) found in " ++ projectDirectory.getPath
         )
-      } else if( projectDirectory.getParentFile.getName == "build" ){
+      } else if( projectDirectory.getParentFile.getName == "cbt-build" ){
         new BasicBuild( managedContext ) with BuildBuild
       } else {
         new BasicBuild( managedContext )

stage2/Lib.scala

@@ -38,7 +38,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{
   def loadRoot(context: Context, default: Context => BuildInterface = new BasicBuild(_)): BuildInterface = {
     context.logger.composition( context.logger.showInvocation("Build.loadRoot",context.projectDirectory) )
     def findStartDir(projectDirectory: File): File = {
-      val buildDir = realpath( projectDirectory ++ "/build" )
+      val buildDir = realpath( projectDirectory ++ "/cbt-build" )
       if(buildDir.exists) findStartDir(buildDir) else projectDirectory
     }
 

stage2/Scaffold.scala

@@ -1,7 +1,6 @@
 package cbt
 import java.io._
 import java.nio.file._
-import java.net._
 trait Scaffold{
   def logger: Logger
 
@@ -27,7 +26,7 @@ trait Scaffold{
   def createBuild(
     projectDirectory: File
   ): Unit = {
-    createFile(projectDirectory, "build/build.scala", s"""import cbt._
+    createFile(projectDirectory, "cbt-build/Build.scala", s"""import cbt._
 class Build(val context: Context) extends BaseBuild{
   override def dependencies =
     super.dependencies ++ // don't forget super.dependencies here for scala-library, etc.

test/test.scala

@@ -239,13 +239,13 @@ object Main{
     {
       val res = runCbt("no-build-file", Seq("run"))
       assert(!res.exit0)
-      assert(res.err contains "No file build.scala (lower case) found in", res.err)
+      assert(res.err contains "No file Build.scala (upper case) found in", res.err)
     }
 
     {
       val res = runCbt("empty-build-file", Seq("run"))
       assert(!res.exit0)
-      assert(res.err contains "You need to define a class Build in build.scala in", res.err)
+      assert(res.err contains "You need to define a class Build in Build.scala in", res.err)
     }
 
     {