From f5bd828a1455c7e65dec1d2b51278417fb9b26cc Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 23 Jan 2015 14:24:17 -0800 Subject: [PATCH] Run bpfmt -w . to reformat Blueprints file Updates the Blueprints file to the new format and standard layout. Change-Id: I1bfb67ab106c2a61fbe6f8201195efc3f8ff5566 --- Blueprints | 151 +++++++++++++++++++++++++++---------------------- build.ninja.in | 16 +++--- 2 files changed, 91 insertions(+), 76 deletions(-) diff --git a/Blueprints b/Blueprints index 823bdcb..88b1fcc 100644 --- a/Blueprints +++ b/Blueprints @@ -1,76 +1,91 @@ -bootstrap_go_package { - name: "blueprint", - deps: ["blueprint-parser", - "blueprint-proptools"], - pkgPath: "blueprint", - srcs: ["context.go", - "live_tracker.go", - "mangle.go", - "module_ctx.go", - "ninja_defs.go", - "ninja_strings.go", - "ninja_writer.go", - "package_ctx.go", - "scope.go", - "singleton_ctx.go", - "unpack.go"], -} +bootstrap_go_package( + name = "blueprint", + deps = [ + "blueprint-parser", + "blueprint-proptools", + ], + pkgPath = "blueprint", + srcs = [ + "context.go", + "live_tracker.go", + "mangle.go", + "module_ctx.go", + "ninja_defs.go", + "ninja_strings.go", + "ninja_writer.go", + "package_ctx.go", + "scope.go", + "singleton_ctx.go", + "unpack.go", + ], +) -bootstrap_go_package { - name: "blueprint-parser", - pkgPath: "blueprint/parser", - srcs: ["parser/modify.go", - "parser/parser.go", - "parser/printer.go", - "parser/sort.go"], -} +bootstrap_go_package( + name = "blueprint-parser", + pkgPath = "blueprint/parser", + srcs = [ + "parser/modify.go", + "parser/parser.go", + "parser/printer.go", + "parser/sort.go", + ], +) -bootstrap_go_package { - name: "blueprint-deptools", - pkgPath: "blueprint/deptools", - srcs: ["deptools/depfile.go"], -} +bootstrap_go_package( + name = "blueprint-deptools", + pkgPath = "blueprint/deptools", + srcs = ["deptools/depfile.go"], +) -bootstrap_go_package { - name: "blueprint-pathtools", - pkgPath: "blueprint/pathtools", - srcs: ["pathtools/lists.go", - "pathtools/glob.go"], -} +bootstrap_go_package( + name = "blueprint-pathtools", + pkgPath = "blueprint/pathtools", + srcs = [ + "pathtools/lists.go", + "pathtools/glob.go", + ], +) -bootstrap_go_package { - name: "blueprint-proptools", - pkgPath: "blueprint/proptools", - srcs: ["proptools/proptools.go"], -} +bootstrap_go_package( + name = "blueprint-proptools", + pkgPath = "blueprint/proptools", + srcs = ["proptools/proptools.go"], +) -bootstrap_go_package { - name: "blueprint-bootstrap", - deps: ["blueprint", - "blueprint-deptools", - "blueprint-pathtools"], - pkgPath: "blueprint/bootstrap", - srcs: ["bootstrap/bootstrap.go", - "bootstrap/cleanup.go", - "bootstrap/command.go", - "bootstrap/config.go", - "bootstrap/doc.go"], -} +bootstrap_go_package( + name = "blueprint-bootstrap", + deps = [ + "blueprint", + "blueprint-deptools", + "blueprint-pathtools", + ], + pkgPath = "blueprint/bootstrap", + srcs = [ + "bootstrap/bootstrap.go", + "bootstrap/cleanup.go", + "bootstrap/command.go", + "bootstrap/config.go", + "bootstrap/doc.go", + ], +) -bootstrap_go_binary { - name: "minibp", - deps: ["blueprint", "blueprint-bootstrap"], - srcs: ["bootstrap/minibp/main.go"], -} +bootstrap_go_binary( + name = "minibp", + deps = [ + "blueprint", + "blueprint-bootstrap", + ], + srcs = ["bootstrap/minibp/main.go"], +) -bootstrap_go_binary { - name: "bpfmt", - deps: ["blueprint-parser"], - srcs: ["bpfmt/bpfmt.go"], -} +bootstrap_go_binary( + name = "bpfmt", + deps = ["blueprint-parser"], + srcs = ["bpfmt/bpfmt.go"], +) -bootstrap_go_binary { - name: "bpmodify", - deps: ["blueprint-parser"], - srcs: ["bpmodify/bpmodify.go"], -} +bootstrap_go_binary( + name = "bpmodify", + deps = ["blueprint-parser"], + srcs = ["bpmodify/bpmodify.go"], +) diff --git a/build.ninja.in b/build.ninja.in index f073974..f626249 100644 --- a/build.ninja.in +++ b/build.ninja.in @@ -73,7 +73,7 @@ default .bootstrap/blueprint/pkg/blueprint.a # Module: blueprint-bootstrap # Type: bootstrap_go_package # Factory: blueprint/bootstrap.newGoPackageModule -# Defined: Blueprints:47:1 +# Defined: Blueprints:55:1 build .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $ @@ -94,7 +94,7 @@ default .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a # Module: blueprint-deptools # Type: bootstrap_go_package # Factory: blueprint/bootstrap.newGoPackageModule -# Defined: Blueprints:28:1 +# Defined: Blueprints:34:1 build .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/deptools/depfile.go | ${g.bootstrap.gcCmd} @@ -105,7 +105,7 @@ default .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a # Module: blueprint-parser # Type: bootstrap_go_package # Factory: blueprint/bootstrap.newGoPackageModule -# Defined: Blueprints:19:1 +# Defined: Blueprints:23:1 build .bootstrap/blueprint-parser/pkg/blueprint/parser.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/parser/modify.go $ @@ -119,7 +119,7 @@ default .bootstrap/blueprint-parser/pkg/blueprint/parser.a # Module: blueprint-pathtools # Type: bootstrap_go_package # Factory: blueprint/bootstrap.newGoPackageModule -# Defined: Blueprints:34:1 +# Defined: Blueprints:40:1 build .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/pathtools/lists.go $ @@ -131,7 +131,7 @@ default .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a # Module: blueprint-proptools # Type: bootstrap_go_package # Factory: blueprint/bootstrap.newGoPackageModule -# Defined: Blueprints:41:1 +# Defined: Blueprints:49:1 build .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/proptools/proptools.go | ${g.bootstrap.gcCmd} @@ -142,7 +142,7 @@ default .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a # Module: bpfmt # Type: bootstrap_go_binary # Factory: blueprint/bootstrap.newGoBinaryModule -# Defined: Blueprints:66:1 +# Defined: Blueprints:81:1 build .bootstrap/bpfmt/obj/bpfmt.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bpfmt/bpfmt.go | ${g.bootstrap.gcCmd} $ @@ -163,7 +163,7 @@ default .bootstrap/bin/bpfmt # Module: bpmodify # Type: bootstrap_go_binary # Factory: blueprint/bootstrap.newGoBinaryModule -# Defined: Blueprints:72:1 +# Defined: Blueprints:87:1 build .bootstrap/bpmodify/obj/bpmodify.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bpmodify/bpmodify.go | ${g.bootstrap.gcCmd} $ @@ -184,7 +184,7 @@ default .bootstrap/bin/bpmodify # Module: minibp # Type: bootstrap_go_binary # Factory: blueprint/bootstrap.newGoBinaryModule -# Defined: Blueprints:60:1 +# Defined: Blueprints:72:1 build .bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bootstrap/minibp/main.go | ${g.bootstrap.gcCmd} $