luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2057 from sbt/wip/fixbuild 

Adds bundledLauncherProj to allProj
This commit is contained in:
eugene yokota 2015-06-20 20:10:23 -04:00
parent 3cda2efb96 bcec8353e0
commit 18c9c19612
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.sbt
View File

@ -484,7 +484,7 @@ def allProjects = Seq(interfaceProj, apiProj,
compileInterfaceProj, compileIncrementalProj, compilePersistProj, compilerProj, compileInterfaceProj, compileIncrementalProj, compilePersistProj, compilerProj,
compilerIntegrationProj, compilerIvyProj, compilerIntegrationProj, compilerIvyProj,
scriptedBaseProj, scriptedSbtProj, scriptedPluginProj, 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)) def projectsWithMyProvided = allProjects.map(p => p.copy(configurations = (p.configurations.filter(_ != Provided)) :+ myProvided))
lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id)) lazy val nonRoots = projectsWithMyProvided.map(p => LocalProject(p.id))
@ -576,6 +576,23 @@ lazy val safeProjects: ScopeFilter = ScopeFilter(
logProj, runProj, stdTaskProj), logProj, runProj, stdTaskProj),
inConfigurations(Test) 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( def customCommands: Seq[Setting[_]] = Seq(
commands += Command.command("setupBuildScala211") { state => commands += Command.command("setupBuildScala211") { state =>
@ -594,6 +611,9 @@ def customCommands: Seq[Setting[_]] = Seq(
safeUnitTests := { safeUnitTests := {
test.all(safeProjects).value test.all(safeProjects).value
}, },
otherUnitTests := {
test.all(otherProjects)
},
commands += Command.command("release-sbt-local") { state => commands += Command.command("release-sbt-local") { state =>
"clean" :: "clean" ::
"allPrecompiled/clean" :: "allPrecompiled/clean" ::