add package to generated Build in build.scala and in-package discovery

This should allow for build to add other builds to their dependencies
and interact with them in a type-safe way. And ever regardless it seems
like good practice to never have the same class existing in the same
package or the top-level package even if they don’t end up on the same
classpath. This might also help make stack traces easier to understand.

Also improve error messages for mistakes with the build class, e.g.
constructor, super classes, etc.

7 files changed, 16 insertions, 6 deletions

diff --git a/test/broken-build/build-class-with-wrong-arguments/build/build.scala b/test/broken-build/build-class-with-wrong-arguments/build/build.scala
new file mode 100644
index 0000000..cf040a1
--- /dev/null
+++ b/test/broken-build/build-class-with-wrong-arguments/build/build.scala
@@ -0,0 +1,3 @@
+package cbt_build.build_class_with_wrong_arguments
+import cbt._
+class Build(i: Int, val context: Context) extends BaseBuild
diff --git a/test/forgot-extend/build/build.scala b/test/broken-build/build-class-with-wrong-parent/build/build.scala
index 9181a5d..9181a5d 100644
--- a/test/forgot-extend/build/build.scala
+++ b/test/broken-build/build-class-with-wrong-parent/build/build.scala
diff --git a/test/empty-build-file/Main.scala b/test/broken-build/empty-build-file/Main.scala
index 19d4beb..19d4beb 100644
--- a/test/empty-build-file/Main.scala
+++ b/test/broken-build/empty-build-file/Main.scala
diff --git a/test/empty-build-file/build/build.scala b/test/broken-build/empty-build-file/build/build.scala
index e69de29..e69de29 100644
--- a/test/empty-build-file/build/build.scala
+++ b/test/broken-build/empty-build-file/build/build.scala
diff --git a/test/no-build-file/Main.scala b/test/broken-build/no-build-file/Main.scala
index 19d4beb..19d4beb 100644
--- a/test/no-build-file/Main.scala
+++ b/test/broken-build/no-build-file/Main.scala
diff --git a/test/no-build-file/build/foo.scala b/test/broken-build/no-build-file/build/foo.scala
index e69de29..e69de29 100644
--- a/test/no-build-file/build/foo.scala
+++ b/test/broken-build/no-build-file/build/foo.scala
diff --git a/test/test.scala b/test/test.scala
index 778fcda..d8714c0 100644
--- a/test/test.scala
+++ b/test/test.scala
@@ -240,21 +240,28 @@ object Main{
     }
 
     {
-      val res = runCbt("forgot-extend", Seq("run"))
+      val res = runCbt("broken-build/build-class-with-wrong-arguments", Seq("run"))
       assert(!res.exit0)
-      assert(res.err contains s"${lib.buildClassName} cannot be cast to cbt.BuildInterface", res.err)
+      assert(res.err contains s"Expected class ${lib.buildClassName}(val context: Context), but found different constructor", res.err)
+      assert(res.err contains s"${lib.buildClassName}(int, interface cbt.Context)", res.err)
     }
 
     {
-      val res = runCbt("no-build-file", Seq("run"))
+      val res = runCbt("broken-build/build-class-with-wrong-parent", Seq("run"))
       assert(!res.exit0)
-      assert(res.err contains s"No file ${lib.buildFileName} (lower case) found in", res.err)
+      assert(res.err contains s"You need to define a class ${lib.buildClassName} extending an appropriate super class", res.err)
     }
 
     {
-      val res = runCbt("empty-build-file", Seq("run"))
+      val res = runCbt("broken-build/no-build-file", Seq("run"))
       assert(!res.exit0)
-      assert(res.err contains s"You need to define a class ${lib.buildClassName} in", res.err)
+      assert(res.err contains s"No file ${lib.buildFileName} (lower case) found", res.err)
+    }
+
+    {
+      val res = runCbt("broken-build/empty-build-file", Seq("run"))
+      assert(!res.exit0)
+      assert(res.err contains s"You need to define a class ${lib.buildClassName}", res.err)
     }
 
     {