Unify reflectively loading builds from directories.

THis is mostly cleanup and a little bit feature.
Before it was done partially in 3 places, BuildBuild,
loadRoot and GitDependency. Now DirectoryDependencies
also support referencing sub-builds.

Also introduce scalariform for the first few files
of cbt's core code :).

2 files changed, 14 insertions, 2 deletions

diff --git a/build/build.scala b/build/build.scala
index 496acdc..c5ad1b7 100644
--- a/build/build.scala
+++ b/build/build.scala
@@ -1,7 +1,7 @@
 import cbt._
 import cbt_internal._
 
-class Build(val context: Context) extends Shared with PublishLocal{
+class Build(val context: Context) extends Shared with Scalariform with PublishLocal{
   override def name: String = "cbt"
   override def version: String = "0.1"
   override def description: String = "Fast, intuitive Build Tool for Scala"
@@ -18,4 +18,16 @@ class Build(val context: Context) extends Shared with PublishLocal{
   override def sources = Seq(
     "nailgun_launcher", "stage1", "stage2", "compatibility"
   ).map( projectDirectory / _ ).flatMap( _.listOrFail )
+
+  override def scalariform = super.scalariform.copy(
+    Seq(
+      context.cbtHome / "stage2" / "DirectoryDependency.scala",
+      context.cbtHome / "stage2" / "LazyDependency.scala"
+    )
+  )
+
+  override def compile = {
+    scalariform()
+    super.compile
+  }
 }
diff --git a/build/build/build.scala b/build/build/build.scala
index 313b2b5..6752f27 100644
--- a/build/build/build.scala
+++ b/build/build/build.scala
@@ -2,6 +2,6 @@ package cbt_build.cbt.build
 import cbt._
 class Build(val context: Context) extends CbtInternal{
   override def dependencies = (
-    super.dependencies :+ cbtInternal.shared
+    super.dependencies :+ cbtInternal.shared :+ plugins.scalariform
   )
 }