From f3ff3594edcdfdc0f2d55f42be1f7ca9286ea9c2 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 13 Jun 2015 20:31:28 -0400
Subject: [PATCH 1/3] Adds bundledLauncherProj to allProj

This matters when someone tries to locally build sbt from source.
---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index fe699f27c..69d868b24 100644
--- a/build.sbt
+++ b/build.sbt
@@ -484,7 +484,7 @@ def allProjects = Seq(interfaceProj, apiProj,
   compileInterfaceProj, compileIncrementalProj, compilePersistProj, compilerProj,
   compilerIntegrationProj, compilerIvyProj,
   scriptedBaseProj, scriptedSbtProj, scriptedPluginProj,
-  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, mavenResolverPluginProj)
+  actionsProj, commandProj, mainSettingsProj, mainProj, sbtProj, bundledLauncherProj, mavenResolverPluginProj)
 
 def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided))
 lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))

From 81343707b990920a83e8c9bad7c3e7530879e208 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 20 Jun 2015 14:21:16 -0400
Subject: [PATCH 2/3] Skip process unit tests

---
 build.sbt | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/build.sbt b/build.sbt
index 69d868b24..d11c586b5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -576,6 +576,23 @@ lazy val safeProjects: ScopeFilter = ScopeFilter(
     logProj, runProj, stdTaskProj),
   inConfigurations(Test)
 )
+lazy val otherUnitTests = taskKey[Unit]("Unit test other projects")
+lazy val otherProjects: ScopeFilter = ScopeFilter(
+  inProjects(interfaceProj, apiProj, controlProj, 
+    applyMacroProj,
+    // processProj, // this one is suspicious
+    ioProj,
+    relationProj, classfileProj, datatypeProj,
+    crossProj, logicProj, testingProj, testAgentProj, taskProj,
+    cacheProj, trackingProj,
+    compileIncrementalProj,
+    compilePersistProj, compilerProj,
+    compilerIntegrationProj, compilerIvyProj,
+    scriptedBaseProj, scriptedSbtProj, scriptedPluginProj,
+    commandProj, mainSettingsProj, mainProj,
+    sbtProj, mavenResolverPluginProj),
+  inConfigurations(Test)
+)
 
 def customCommands: Seq[Setting[_]] = Seq(
   commands += Command.command("setupBuildScala211") { state =>
@@ -594,6 +611,9 @@ def customCommands: Seq[Setting[_]] = Seq(
   safeUnitTests := {
     test.all(safeProjects).value
   },
+  otherUnitTests := {
+    test.all(otherProjects)
+  }
   commands += Command.command("release-sbt-local") { state =>
     "clean" ::
     "allPrecompiled/clean" ::

From bcec8353e07fe34295c9d0ae6701f90a3ca99883 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Sat, 20 Jun 2015 14:42:26 -0400
Subject: [PATCH 3/3] Fix typo

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index d11c586b5..62f797f83 100644
--- a/build.sbt
+++ b/build.sbt
@@ -613,7 +613,7 @@ def customCommands: Seq[Setting[_]] = Seq(
   },
   otherUnitTests := {
     test.all(otherProjects)
-  }
+  },
   commands += Command.command("release-sbt-local") { state =>
     "clean" ::
     "allPrecompiled/clean" ::