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

hook for more global build transformations

This commit is contained in:
Mark Harrah 2011-10-26 19:35:29 -04:00
parent b2398172b2
commit c2ebcba73b
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/BuildLoader.scala
View File

@ -5,7 +5,7 @@ package sbt
import java.io.File import java.io.File
import java.net.URI import java.net.URI
import Load.{BuildUnit, LoadBuildConfiguration} import Load.{BuildUnit, LoadBuildConfiguration, PartBuild}
import BuildLoader._ import BuildLoader._
import Alternatives._ import Alternatives._
import Types.{const,idFun} import Types.{const,idFun}
@ -48,16 +48,19 @@ object BuildLoader
type Builder = BuildInfo => Option[() => BuildUnit] type Builder = BuildInfo => Option[() => BuildUnit]
type Transformer = TransformInfo => BuildUnit type Transformer = TransformInfo => BuildUnit
type Loader = LoadInfo => Option[() => BuildUnit] type Loader = LoadInfo => Option[() => BuildUnit]
type TransformAll = PartBuild => PartBuild
final class Components(val resolver: Resolver, val builder: Builder, val transformer: Transformer, val full: Loader) { final class Components(val resolver: Resolver, val builder: Builder, val transformer: Transformer, val full: Loader, val transformAll: TransformAll) {
def | (cs: Components): Components = new Components(resolver | cs.resolver, builder | cs.builder, seq(transformer, cs.transformer), full | cs.full) def | (cs: Components): Components =
new Components(resolver | cs.resolver, builder | cs.builder, seq(transformer, cs.transformer), full | cs.full, transformAll andThen cs.transformAll)
} }
def transform(t: Transformer): Components = components(transformer = t) def transform(t: Transformer): Components = components(transformer = t)
def resolve(r: Resolver): Components = components(resolver = r) def resolve(r: Resolver): Components = components(resolver = r)
def build(b: Builder): Components = components(builder = b) def build(b: Builder): Components = components(builder = b)
def full(f: Loader): Components = components(full = f) def full(f: Loader): Components = components(full = f)
def components(resolver: Resolver = const(None), builder: Builder = const(None), transformer: Transformer = _.unit, full: Loader = const(None)) = def transformAll(t: TransformAll) = components(transformAll = t)
new Components(resolver, builder, transformer, full) def components(resolver: Resolver = const(None), builder: Builder = const(None), transformer: Transformer = _.unit, full: Loader = const(None), transformAll: TransformAll = idFun) =
new Components(resolver, builder, transformer, full, transformAll)
def seq(a: Transformer, b: Transformer): Transformer = info => b(info.setUnit(a(info))) def seq(a: Transformer, b: Transformer): Transformer = info => b(info.setUnit(a(info)))
@ -77,7 +80,7 @@ object BuildLoader
def apply(base: Components, fail: URI => Nothing, s: State, config: LoadBuildConfiguration): BuildLoader = def apply(base: Components, fail: URI => Nothing, s: State, config: LoadBuildConfiguration): BuildLoader =
{ {
def makeMulti[S <: Info, T](base: S => Option[T]) = new MultiHandler[S,T](base, None, Nil, _.uri, _.config.log) def makeMulti[S <: Info, T](base: S => Option[T]) = new MultiHandler[S,T](base, None, Nil, _.uri, _.config.log)
new BuildLoader(fail, s, config, makeMulti(base.resolver), makeMulti(base.builder), base.transformer, makeMulti(base.full)) new BuildLoader(fail, s, config, makeMulti(base.resolver), makeMulti(base.builder), base.transformer, makeMulti(base.full), base.transformAll)
} }
def componentLoader: Loader = (info: LoadInfo) => { def componentLoader: Loader = (info: LoadInfo) => {
@ -101,23 +104,26 @@ final class BuildLoader(
val resolvers: MultiHandler[ResolveInfo, ()=>File], val resolvers: MultiHandler[ResolveInfo, ()=>File],
val builders: MultiHandler[BuildInfo, ()=>BuildUnit], val builders: MultiHandler[BuildInfo, ()=>BuildUnit],
val transformer: Transformer, val transformer: Transformer,
val full: MultiHandler[LoadInfo, ()=>BuildUnit]) val full: MultiHandler[LoadInfo, ()=>BuildUnit],
val transformAll: TransformAll)
{ {
def addNonRoot(uri: URI, loaders: Components): BuildLoader = def addNonRoot(uri: URI, loaders: Components): BuildLoader =
new BuildLoader(fail, state, config, new BuildLoader(fail, state, config,
resolvers.addNonRoot(uri, loaders.resolver), resolvers.addNonRoot(uri, loaders.resolver),
builders.addNonRoot(uri, loaders.builder), builders.addNonRoot(uri, loaders.builder),
seq(transformer, loaders.transformer), seq(transformer, loaders.transformer),
full.addNonRoot(uri, loaders.full) full.addNonRoot(uri, loaders.full),
transformAll andThen loaders.transformAll
) )
def setRoot(loaders: Components): BuildLoader = def setRoot(loaders: Components): BuildLoader =
new BuildLoader(fail, state, config, new BuildLoader(fail, state, config,
resolvers.setRoot(loaders.resolver), resolvers.setRoot(loaders.resolver),
builders.setRoot(loaders.builder), builders.setRoot(loaders.builder),
seq(loaders.transformer, transformer), seq(loaders.transformer, transformer),
full.setRoot(loaders.full) full.setRoot(loaders.full),
loaders.transformAll andThen transformAll
) )
def components = new Components(resolvers.applyFun, builders.applyFun, transformer, full.applyFun) def components = new Components(resolvers.applyFun, builders.applyFun, transformer, full.applyFun, transformAll)
def apply(uri: URI): BuildUnit = def apply(uri: URI): BuildUnit =
{ {
val info = new LoadInfo(uri, config.stagingDirectory, config, state, components) val info = new LoadInfo(uri, config.stagingDirectory, config, state, components)

9
main/Load.scala
View File

@ -238,9 +238,10 @@ object Load
def loadURI(uri: URI, loaders: BuildLoader): PartBuild = def loadURI(uri: URI, loaders: BuildLoader): PartBuild =
{ {
IO.assertAbsolute(uri) IO.assertAbsolute(uri)
val (referenced, map) = loadAll(uri :: Nil, Map.empty, loaders, Map.empty) val (referenced, map, newLoaders) = loadAll(uri :: Nil, Map.empty, loaders, Map.empty)
checkAll(referenced, map) checkAll(referenced, map)
new PartBuild(uri, map) val build = new PartBuild(uri, map)
newLoaders transformAll build
} }
def addResolvers(unit: BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader = def addResolvers(unit: BuildUnit, isRoot: Boolean, loaders: BuildLoader): BuildLoader =
unit.definitions.builds.flatMap(_.buildLoaders) match unit.definitions.builds.flatMap(_.buildLoaders) match
@ -273,7 +274,7 @@ object Load
Project.transform(resolve, unit.definitions.builds.flatMap(_.settings)) Project.transform(resolve, unit.definitions.builds.flatMap(_.settings))
} }
@tailrec def loadAll(bases: List[URI], references: Map[URI, List[ProjectReference]], loaders: BuildLoader, builds: Map[URI, PartBuildUnit]): (Map[URI, List[ProjectReference]], Map[URI, PartBuildUnit]) = @tailrec def loadAll(bases: List[URI], references: Map[URI, List[ProjectReference]], loaders: BuildLoader, builds: Map[URI, PartBuildUnit]): (Map[URI, List[ProjectReference]], Map[URI, PartBuildUnit], BuildLoader) =
bases match bases match
{ {
case b :: bs => case b :: bs =>
@ -286,7 +287,7 @@ object Load
val newLoader = addResolvers(loadedBuild.unit, builds.isEmpty, loaders) val newLoader = addResolvers(loadedBuild.unit, builds.isEmpty, loaders)
loadAll(refs.flatMap(Reference.uri) reverse_::: bs, references.updated(b, refs), newLoader, builds.updated(b, loadedBuild)) loadAll(refs.flatMap(Reference.uri) reverse_::: bs, references.updated(b, refs), newLoader, builds.updated(b, loadedBuild))
} }
case Nil => (references, builds) case Nil => (references, builds, loaders)
} }
def checkProjectBase(buildBase: File, projectBase: File) def checkProjectBase(buildBase: File, projectBase: File)
{ {