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

Merge pull request #142 from danw/_GOOS.go

Browse source 
Support filtering OS-dependent go files using _darwin/_linux.go
This commit is contained in:
Dan Willemsen 2017-02-21 15:07:00 -08:00 committed by GitHub
commit 2831e690f0
1 changed files with 44 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
bootstrap/bootstrap.go
View file

@ -17,6 +17,7 @@ package bootstrap
import (
"fmt"
"path/filepath"
"runtime"
"strings"
"github.com/google/blueprint"
@ -201,6 +202,15 @@ type goPackage struct {
TestSrcs []string
PluginFor []string
Darwin struct {
Srcs []string
TestSrcs []string
}
Linux struct {
Srcs []string
TestSrcs []string
}
// The stage in which this module should be built
BuildStage Stage `blueprint:"mutated"`
}
@ -307,14 +317,23 @@ func (g *goPackage) GenerateBuildActions(ctx blueprint.ModuleContext) {
return
}
var srcs, testSrcs []string
if runtime.GOOS == "darwin" {
srcs = append(g.properties.Srcs, g.properties.Darwin.Srcs...)
testSrcs = append(g.properties.TestSrcs, g.properties.Darwin.TestSrcs...)
} else if runtime.GOOS == "linux" {
srcs = append(g.properties.Srcs, g.properties.Linux.Srcs...)
testSrcs = append(g.properties.TestSrcs, g.properties.Linux.TestSrcs...)
}
if g.config.runGoTests {
g.testResultFile = buildGoTest(ctx, testRoot(ctx), testArchiveFile,
g.properties.PkgPath, g.properties.Srcs, genSrcs,
g.properties.TestSrcs)
g.properties.PkgPath, srcs, genSrcs,
testSrcs)
}
buildGoPackage(ctx, g.pkgRoot, g.properties.PkgPath, g.archiveFile,
g.properties.Srcs, genSrcs)
srcs, genSrcs)
}
}
@ -327,6 +346,15 @@ type goBinary struct {
TestSrcs []string
PrimaryBuilder bool
Darwin struct {
Srcs []string
TestSrcs []string
}
Linux struct {
Srcs []string
TestSrcs []string
}
// The stage in which this module should be built
BuildStage Stage `blueprint:"mutated"`
}
@ -391,12 +419,21 @@ func (g *goBinary) GenerateBuildActions(ctx blueprint.ModuleContext) {
return
}
if g.config.runGoTests {
deps = buildGoTest(ctx, testRoot(ctx), testArchiveFile,
name, g.properties.Srcs, genSrcs, g.properties.TestSrcs)
var srcs, testSrcs []string
if runtime.GOOS == "darwin" {
srcs = append(g.properties.Srcs, g.properties.Darwin.Srcs...)
testSrcs = append(g.properties.TestSrcs, g.properties.Darwin.TestSrcs...)
} else if runtime.GOOS == "linux" {
srcs = append(g.properties.Srcs, g.properties.Linux.Srcs...)
testSrcs = append(g.properties.TestSrcs, g.properties.Linux.TestSrcs...)
}
buildGoPackage(ctx, objDir, name, archiveFile, g.properties.Srcs, genSrcs)
if g.config.runGoTests {
deps = buildGoTest(ctx, testRoot(ctx), testArchiveFile,
name, srcs, genSrcs, testSrcs)
}
buildGoPackage(ctx, objDir, name, archiveFile, srcs, genSrcs)
var libDirFlags []string
ctx.VisitDepsDepthFirstIf(isGoPackageProducer,