Run bpfmt -w . to reformat Blueprints file

Updates the Blueprints file to the new format and standard layout.

Change-Id: I1bfb67ab106c2a61fbe6f8201195efc3f8ff5566
This commit is contained in:
Colin Cross 2015-01-23 14:24:17 -08:00
parent 8e0c51192a
commit f5bd828a14
2 changed files with 91 additions and 76 deletions

View file

@ -1,9 +1,12 @@
bootstrap_go_package { bootstrap_go_package(
name: "blueprint", name = "blueprint",
deps: ["blueprint-parser", deps = [
"blueprint-proptools"], "blueprint-parser",
pkgPath: "blueprint", "blueprint-proptools",
srcs: ["context.go", ],
pkgPath = "blueprint",
srcs = [
"context.go",
"live_tracker.go", "live_tracker.go",
"mangle.go", "mangle.go",
"module_ctx.go", "module_ctx.go",
@ -13,64 +16,76 @@ bootstrap_go_package {
"package_ctx.go", "package_ctx.go",
"scope.go", "scope.go",
"singleton_ctx.go", "singleton_ctx.go",
"unpack.go"], "unpack.go",
} ],
)
bootstrap_go_package { bootstrap_go_package(
name: "blueprint-parser", name = "blueprint-parser",
pkgPath: "blueprint/parser", pkgPath = "blueprint/parser",
srcs: ["parser/modify.go", srcs = [
"parser/modify.go",
"parser/parser.go", "parser/parser.go",
"parser/printer.go", "parser/printer.go",
"parser/sort.go"], "parser/sort.go",
} ],
)
bootstrap_go_package { bootstrap_go_package(
name: "blueprint-deptools", name = "blueprint-deptools",
pkgPath: "blueprint/deptools", pkgPath = "blueprint/deptools",
srcs: ["deptools/depfile.go"], srcs = ["deptools/depfile.go"],
} )
bootstrap_go_package { bootstrap_go_package(
name: "blueprint-pathtools", name = "blueprint-pathtools",
pkgPath: "blueprint/pathtools", pkgPath = "blueprint/pathtools",
srcs: ["pathtools/lists.go", srcs = [
"pathtools/glob.go"], "pathtools/lists.go",
} "pathtools/glob.go",
],
)
bootstrap_go_package { bootstrap_go_package(
name: "blueprint-proptools", name = "blueprint-proptools",
pkgPath: "blueprint/proptools", pkgPath = "blueprint/proptools",
srcs: ["proptools/proptools.go"], srcs = ["proptools/proptools.go"],
} )
bootstrap_go_package { bootstrap_go_package(
name: "blueprint-bootstrap", name = "blueprint-bootstrap",
deps: ["blueprint", deps = [
"blueprint",
"blueprint-deptools", "blueprint-deptools",
"blueprint-pathtools"], "blueprint-pathtools",
pkgPath: "blueprint/bootstrap", ],
srcs: ["bootstrap/bootstrap.go", pkgPath = "blueprint/bootstrap",
srcs = [
"bootstrap/bootstrap.go",
"bootstrap/cleanup.go", "bootstrap/cleanup.go",
"bootstrap/command.go", "bootstrap/command.go",
"bootstrap/config.go", "bootstrap/config.go",
"bootstrap/doc.go"], "bootstrap/doc.go",
} ],
)
bootstrap_go_binary { bootstrap_go_binary(
name: "minibp", name = "minibp",
deps: ["blueprint", "blueprint-bootstrap"], deps = [
srcs: ["bootstrap/minibp/main.go"], "blueprint",
} "blueprint-bootstrap",
],
srcs = ["bootstrap/minibp/main.go"],
)
bootstrap_go_binary { bootstrap_go_binary(
name: "bpfmt", name = "bpfmt",
deps: ["blueprint-parser"], deps = ["blueprint-parser"],
srcs: ["bpfmt/bpfmt.go"], srcs = ["bpfmt/bpfmt.go"],
} )
bootstrap_go_binary { bootstrap_go_binary(
name: "bpmodify", name = "bpmodify",
deps: ["blueprint-parser"], deps = ["blueprint-parser"],
srcs: ["bpmodify/bpmodify.go"], srcs = ["bpmodify/bpmodify.go"],
} )

View file

@ -73,7 +73,7 @@ default .bootstrap/blueprint/pkg/blueprint.a
# Module: blueprint-bootstrap # Module: blueprint-bootstrap
# Type: bootstrap_go_package # Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule # Factory: blueprint/bootstrap.newGoPackageModule
# Defined: Blueprints:47:1 # Defined: Blueprints:55:1
build .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a: g.bootstrap.gc $ build .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/bootstrap/bootstrap.go $ ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $
@ -94,7 +94,7 @@ default .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a
# Module: blueprint-deptools # Module: blueprint-deptools
# Type: bootstrap_go_package # Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule # Factory: blueprint/bootstrap.newGoPackageModule
# Defined: Blueprints:28:1 # Defined: Blueprints:34:1
build .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a: g.bootstrap.gc $ build .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/deptools/depfile.go | ${g.bootstrap.gcCmd} ${g.bootstrap.srcDir}/deptools/depfile.go | ${g.bootstrap.gcCmd}
@ -105,7 +105,7 @@ default .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a
# Module: blueprint-parser # Module: blueprint-parser
# Type: bootstrap_go_package # Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule # Factory: blueprint/bootstrap.newGoPackageModule
# Defined: Blueprints:19:1 # Defined: Blueprints:23:1
build .bootstrap/blueprint-parser/pkg/blueprint/parser.a: g.bootstrap.gc $ build .bootstrap/blueprint-parser/pkg/blueprint/parser.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/parser/modify.go $ ${g.bootstrap.srcDir}/parser/modify.go $
@ -119,7 +119,7 @@ default .bootstrap/blueprint-parser/pkg/blueprint/parser.a
# Module: blueprint-pathtools # Module: blueprint-pathtools
# Type: bootstrap_go_package # Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule # Factory: blueprint/bootstrap.newGoPackageModule
# Defined: Blueprints:34:1 # Defined: Blueprints:40:1
build .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a: g.bootstrap.gc $ build .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/pathtools/lists.go $ ${g.bootstrap.srcDir}/pathtools/lists.go $
@ -131,7 +131,7 @@ default .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a
# Module: blueprint-proptools # Module: blueprint-proptools
# Type: bootstrap_go_package # Type: bootstrap_go_package
# Factory: blueprint/bootstrap.newGoPackageModule # Factory: blueprint/bootstrap.newGoPackageModule
# Defined: Blueprints:41:1 # Defined: Blueprints:49:1
build .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a: g.bootstrap.gc $ build .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/proptools/proptools.go | ${g.bootstrap.gcCmd} ${g.bootstrap.srcDir}/proptools/proptools.go | ${g.bootstrap.gcCmd}
@ -142,7 +142,7 @@ default .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a
# Module: bpfmt # Module: bpfmt
# Type: bootstrap_go_binary # Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule # Factory: blueprint/bootstrap.newGoBinaryModule
# Defined: Blueprints:66:1 # Defined: Blueprints:81:1
build .bootstrap/bpfmt/obj/bpfmt.a: g.bootstrap.gc $ build .bootstrap/bpfmt/obj/bpfmt.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/bpfmt/bpfmt.go | ${g.bootstrap.gcCmd} $ ${g.bootstrap.srcDir}/bpfmt/bpfmt.go | ${g.bootstrap.gcCmd} $
@ -163,7 +163,7 @@ default .bootstrap/bin/bpfmt
# Module: bpmodify # Module: bpmodify
# Type: bootstrap_go_binary # Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule # Factory: blueprint/bootstrap.newGoBinaryModule
# Defined: Blueprints:72:1 # Defined: Blueprints:87:1
build .bootstrap/bpmodify/obj/bpmodify.a: g.bootstrap.gc $ build .bootstrap/bpmodify/obj/bpmodify.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/bpmodify/bpmodify.go | ${g.bootstrap.gcCmd} $ ${g.bootstrap.srcDir}/bpmodify/bpmodify.go | ${g.bootstrap.gcCmd} $
@ -184,7 +184,7 @@ default .bootstrap/bin/bpmodify
# Module: minibp # Module: minibp
# Type: bootstrap_go_binary # Type: bootstrap_go_binary
# Factory: blueprint/bootstrap.newGoBinaryModule # Factory: blueprint/bootstrap.newGoBinaryModule
# Defined: Blueprints:60:1 # Defined: Blueprints:72:1
build .bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $ build .bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $
${g.bootstrap.srcDir}/bootstrap/minibp/main.go | ${g.bootstrap.gcCmd} $ ${g.bootstrap.srcDir}/bootstrap/minibp/main.go | ${g.bootstrap.gcCmd} $