tequilaOS/platform_build_blueprint
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark intermediates as optional

Browse source 
Instead of forcing things to be built alongside the primary builder,
mark all packages and binaries as optional, unless they're explicitly
marked as default.

Change-Id: Ie53c90a01b41ce886d651f9aa4c4900d1edb0157
This commit is contained in:
Dan Willemsen 2017-07-19 18:48:01 -07:00
parent 91e2483024
commit f60525a63d
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bootstrap/bootstrap.go
View file

@ -343,6 +343,7 @@ type goBinary struct {
Srcs []string
TestSrcs []string
PrimaryBuilder bool
Default bool
Darwin struct {
Srcs []string
@ -448,10 +449,11 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
}
ctx.Build(pctx, blueprint.BuildParams{
Rule: link,
Outputs: []string{aoutFile},
Inputs: []string{archiveFile},
Args: linkArgs,
Rule: link,
Outputs: []string{aoutFile},
Inputs: []string{archiveFile},
Args: linkArgs,
Optional: true,
})
ctx.Build(pctx, blueprint.BuildParams{
@ -459,6 +461,7 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
Outputs: []string{binaryFile},
Inputs: []string{aoutFile},
OrderOnly: deps,
Optional: !g.properties.Default,
})
}
}
@ -481,6 +484,7 @@ func buildGoPluginLoader(ctx blueprint.ModuleContext, pkgPath, pluginSrc string,
"pkg": pkgPath,
"plugins": strings.Join(pluginPaths, " "),
},
Optional: true,
})
return ret
@ -518,6 +522,7 @@ func buildGoPackage(ctx blueprint.ModuleContext, pkgRoot string,
Inputs: srcFiles,
Implicits: deps,
Args: compileArgs,
Optional: true,
})
}
@ -546,6 +551,7 @@ func buildGoTest(ctx blueprint.ModuleContext, testRoot, testPkgArchive,
Args: map[string]string{
"pkg": pkgPath,
},
Optional: true,
})
libDirFlags := []string{"-L " + testRoot}
@ -567,6 +573,7 @@ func buildGoTest(ctx blueprint.ModuleContext, testRoot, testPkgArchive,
"pkgPath": "main",
"incFlags": "-I " + testRoot,
},
Optional: true,
})
ctx.Build(pctx, blueprint.BuildParams{
@ -576,6 +583,7 @@ func buildGoTest(ctx blueprint.ModuleContext, testRoot, testPkgArchive,
Args: map[string]string{
"libDirFlags": strings.Join(libDirFlags, " "),
},
Optional: true,
})
ctx.Build(pctx, blueprint.BuildParams{
@ -587,6 +595,7 @@ func buildGoTest(ctx blueprint.ModuleContext, testRoot, testPkgArchive,
"pkg": pkgPath,
"pkgSrcDir": filepath.Dir(testFiles[0]),
},
Optional: true,
})
return []string{testPassed}