From 6cafc2cddc317680eddae62d82a879125161aeaf Mon Sep 17 00:00:00 2001 From: Jamie Gennis Date: Fri, 20 Mar 2015 22:39:29 -0400 Subject: [PATCH] Update import paths to include github --- Blueprints | 12 ++-- bootstrap/bootstrap.go | 6 +- bootstrap/cleanup.go | 2 +- bootstrap/command.go | 4 +- bootstrap/doc.go | 4 +- bootstrap/minibp/main.go | 4 +- bpfmt/bpfmt.go | 2 +- bpmodify/bpmodify.go | 2 +- build.ninja.in | 116 ++++++++++++++++++++++----------------- context.go | 6 +- parser/printer_test.go | 20 +++---- splice_modules_test.go | 2 +- unpack.go | 4 +- unpack_test.go | 4 +- 14 files changed, 103 insertions(+), 85 deletions(-) diff --git a/Blueprints b/Blueprints index 88b1fcc..7b0d22a 100644 --- a/Blueprints +++ b/Blueprints @@ -4,7 +4,7 @@ bootstrap_go_package( "blueprint-parser", "blueprint-proptools", ], - pkgPath = "blueprint", + pkgPath = "github.com/google/blueprint", srcs = [ "context.go", "live_tracker.go", @@ -22,7 +22,7 @@ bootstrap_go_package( bootstrap_go_package( name = "blueprint-parser", - pkgPath = "blueprint/parser", + pkgPath = "github.com/google/blueprint/parser", srcs = [ "parser/modify.go", "parser/parser.go", @@ -33,13 +33,13 @@ bootstrap_go_package( bootstrap_go_package( name = "blueprint-deptools", - pkgPath = "blueprint/deptools", + pkgPath = "github.com/google/blueprint/deptools", srcs = ["deptools/depfile.go"], ) bootstrap_go_package( name = "blueprint-pathtools", - pkgPath = "blueprint/pathtools", + pkgPath = "github.com/google/blueprint/pathtools", srcs = [ "pathtools/lists.go", "pathtools/glob.go", @@ -48,7 +48,7 @@ bootstrap_go_package( bootstrap_go_package( name = "blueprint-proptools", - pkgPath = "blueprint/proptools", + pkgPath = "github.com/google/blueprint/proptools", srcs = ["proptools/proptools.go"], ) @@ -59,7 +59,7 @@ bootstrap_go_package( "blueprint-deptools", "blueprint-pathtools", ], - pkgPath = "blueprint/bootstrap", + pkgPath = "github.com/google/blueprint/bootstrap", srcs = [ "bootstrap/bootstrap.go", "bootstrap/cleanup.go", diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go index c081715..ead4ceb 100644 --- a/bootstrap/bootstrap.go +++ b/bootstrap/bootstrap.go @@ -15,9 +15,9 @@ package bootstrap import ( - "blueprint" - "blueprint/pathtools" "fmt" + "github.com/google/blueprint" + "github.com/google/blueprint/pathtools" "os" "path/filepath" "strconv" @@ -27,7 +27,7 @@ import ( const bootstrapDir = ".bootstrap" var ( - pctx = blueprint.NewPackageContext("blueprint/bootstrap") + pctx = blueprint.NewPackageContext("github.com/google/blueprint/bootstrap") gcCmd = pctx.StaticVariable("gcCmd", "$goToolDir/${goChar}g") linkCmd = pctx.StaticVariable("linkCmd", "$goToolDir/${goChar}l") diff --git a/bootstrap/cleanup.go b/bootstrap/cleanup.go index 09f58ad..5f53d5d 100644 --- a/bootstrap/cleanup.go +++ b/bootstrap/cleanup.go @@ -15,10 +15,10 @@ package bootstrap import ( - "blueprint" "bufio" "errors" "fmt" + "github.com/google/blueprint" "os" "path/filepath" "strings" diff --git a/bootstrap/command.go b/bootstrap/command.go index 53a2749..26ae20a 100644 --- a/bootstrap/command.go +++ b/bootstrap/command.go @@ -15,11 +15,11 @@ package bootstrap import ( - "blueprint" - "blueprint/deptools" "bytes" "flag" "fmt" + "github.com/google/blueprint" + "github.com/google/blueprint/deptools" "io/ioutil" "os" "path/filepath" diff --git a/bootstrap/doc.go b/bootstrap/doc.go index 6186f17..573ff7b 100644 --- a/bootstrap/doc.go +++ b/bootstrap/doc.go @@ -38,9 +38,9 @@ // package main // // import ( -// "blueprint" -// "blueprint/bootstrap" // "flag" +// "github.com/google/blueprint" +// "github.com/google/blueprint/bootstrap" // "path/filepath" // // "my/custom/build/logic" diff --git a/bootstrap/minibp/main.go b/bootstrap/minibp/main.go index 2eae7ba..ad36c29 100644 --- a/bootstrap/minibp/main.go +++ b/bootstrap/minibp/main.go @@ -15,9 +15,9 @@ package main import ( - "blueprint" - "blueprint/bootstrap" "flag" + "github.com/google/blueprint" + "github.com/google/blueprint/bootstrap" ) var runAsPrimaryBuilder bool diff --git a/bpfmt/bpfmt.go b/bpfmt/bpfmt.go index 021fcf1..96e0b1e 100644 --- a/bpfmt/bpfmt.go +++ b/bpfmt/bpfmt.go @@ -6,10 +6,10 @@ package main import ( - "blueprint/parser" "bytes" "flag" "fmt" + "github.com/google/blueprint/parser" "io" "io/ioutil" "os" diff --git a/bpmodify/bpmodify.go b/bpmodify/bpmodify.go index e17188f..f4216dd 100644 --- a/bpmodify/bpmodify.go +++ b/bpmodify/bpmodify.go @@ -6,10 +6,10 @@ package main import ( - "blueprint/parser" "bytes" "flag" "fmt" + "github.com/google/blueprint/parser" "io" "io/ioutil" "os" diff --git a/build.ninja.in b/build.ninja.in index f626249..073ed7f 100644 --- a/build.ninja.in +++ b/build.ninja.in @@ -5,7 +5,7 @@ # This file contains variables, rules, and pools with name prefixes indicating # they were generated by the following Go packages: # -# bootstrap [from Go package blueprint/bootstrap] +# bootstrap [from Go package github.com/google/blueprint/bootstrap] # ninja_required_version = 1.1.0 @@ -50,11 +50,12 @@ rule g.bootstrap.link # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:1:1 -build .bootstrap/blueprint/pkg/blueprint.a: g.bootstrap.gc $ +build .bootstrap/blueprint/pkg/github.com/google/blueprint.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/context.go ${g.bootstrap.srcDir}/live_tracker.go $ ${g.bootstrap.srcDir}/mangle.go ${g.bootstrap.srcDir}/module_ctx.go $ ${g.bootstrap.srcDir}/ninja_defs.go $ @@ -63,90 +64,105 @@ build .bootstrap/blueprint/pkg/blueprint.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/package_ctx.go ${g.bootstrap.srcDir}/scope.go $ ${g.bootstrap.srcDir}/singleton_ctx.go ${g.bootstrap.srcDir}/unpack.go $ | ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/blueprint/parser.a $ - .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg - pkgPath = blueprint -default .bootstrap/blueprint/pkg/blueprint.a + pkgPath = github.com/google/blueprint +default .bootstrap/blueprint/pkg/github.com/google/blueprint.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint-bootstrap +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:55:1 -build .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a: g.bootstrap.gc $ - ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $ +build $ + .bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a $ + : g.bootstrap.gc ${g.bootstrap.srcDir}/bootstrap/bootstrap.go $ ${g.bootstrap.srcDir}/bootstrap/cleanup.go $ ${g.bootstrap.srcDir}/bootstrap/command.go $ ${g.bootstrap.srcDir}/bootstrap/config.go $ ${g.bootstrap.srcDir}/bootstrap/doc.go | ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/blueprint/parser.a $ - .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $ - .bootstrap/blueprint/pkg/blueprint.a $ - .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $ - .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ + .bootstrap/blueprint/pkg/github.com/google/blueprint.a $ + .bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $ + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg - pkgPath = blueprint/bootstrap -default .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a + pkgPath = github.com/google/blueprint/bootstrap +default $ + .bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint-deptools +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:34:1 -build .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a: g.bootstrap.gc $ - ${g.bootstrap.srcDir}/deptools/depfile.go | ${g.bootstrap.gcCmd} - pkgPath = blueprint/deptools -default .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a +build .bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $ + : g.bootstrap.gc ${g.bootstrap.srcDir}/deptools/depfile.go | $ + ${g.bootstrap.gcCmd} + pkgPath = github.com/google/blueprint/deptools +default $ + .bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint-parser +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:23:1 -build .bootstrap/blueprint-parser/pkg/blueprint/parser.a: g.bootstrap.gc $ - ${g.bootstrap.srcDir}/parser/modify.go $ +build .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a: $ + g.bootstrap.gc ${g.bootstrap.srcDir}/parser/modify.go $ ${g.bootstrap.srcDir}/parser/parser.go $ ${g.bootstrap.srcDir}/parser/printer.go $ ${g.bootstrap.srcDir}/parser/sort.go | ${g.bootstrap.gcCmd} - pkgPath = blueprint/parser -default .bootstrap/blueprint-parser/pkg/blueprint/parser.a + pkgPath = github.com/google/blueprint/parser +default .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint-pathtools +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:40:1 -build .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a: g.bootstrap.gc $ - ${g.bootstrap.srcDir}/pathtools/lists.go $ +build $ + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $ + : g.bootstrap.gc ${g.bootstrap.srcDir}/pathtools/lists.go $ ${g.bootstrap.srcDir}/pathtools/glob.go | ${g.bootstrap.gcCmd} - pkgPath = blueprint/pathtools -default .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a + pkgPath = github.com/google/blueprint/pathtools +default $ + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: blueprint-proptools +# Variant: # Type: bootstrap_go_package -# Factory: blueprint/bootstrap.newGoPackageModule +# Factory: github.com/google/blueprint/bootstrap.newGoPackageModule # Defined: Blueprints:49:1 -build .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a: g.bootstrap.gc $ - ${g.bootstrap.srcDir}/proptools/proptools.go | ${g.bootstrap.gcCmd} - pkgPath = blueprint/proptools -default .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a +build $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ + : g.bootstrap.gc ${g.bootstrap.srcDir}/proptools/proptools.go | $ + ${g.bootstrap.gcCmd} + pkgPath = github.com/google/blueprint/proptools +default $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: bpfmt +# Variant: # Type: bootstrap_go_binary -# Factory: blueprint/bootstrap.newGoBinaryModule +# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule # Defined: Blueprints:81:1 build .bootstrap/bpfmt/obj/bpfmt.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bpfmt/bpfmt.go | ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/blueprint/parser.a + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a incFlags = -I .bootstrap/blueprint-parser/pkg pkgPath = bpfmt default .bootstrap/bpfmt/obj/bpfmt.a @@ -161,13 +177,14 @@ default .bootstrap/bin/bpfmt # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: bpmodify +# Variant: # Type: bootstrap_go_binary -# Factory: blueprint/bootstrap.newGoBinaryModule +# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule # Defined: Blueprints:87:1 build .bootstrap/bpmodify/obj/bpmodify.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bpmodify/bpmodify.go | ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/blueprint/parser.a + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a incFlags = -I .bootstrap/blueprint-parser/pkg pkgPath = bpmodify default .bootstrap/bpmodify/obj/bpmodify.a @@ -182,18 +199,19 @@ default .bootstrap/bin/bpmodify # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Module: minibp +# Variant: # Type: bootstrap_go_binary -# Factory: blueprint/bootstrap.newGoBinaryModule +# Factory: github.com/google/blueprint/bootstrap.newGoBinaryModule # Defined: Blueprints:72:1 build .bootstrap/minibp/obj/minibp.a: g.bootstrap.gc $ ${g.bootstrap.srcDir}/bootstrap/minibp/main.go | ${g.bootstrap.gcCmd} $ - .bootstrap/blueprint-parser/pkg/blueprint/parser.a $ - .bootstrap/blueprint-proptools/pkg/blueprint/proptools.a $ - .bootstrap/blueprint/pkg/blueprint.a $ - .bootstrap/blueprint-deptools/pkg/blueprint/deptools.a $ - .bootstrap/blueprint-pathtools/pkg/blueprint/pathtools.a $ - .bootstrap/blueprint-bootstrap/pkg/blueprint/bootstrap.a + .bootstrap/blueprint-parser/pkg/github.com/google/blueprint/parser.a $ + .bootstrap/blueprint-proptools/pkg/github.com/google/blueprint/proptools.a $ + .bootstrap/blueprint/pkg/github.com/google/blueprint.a $ + .bootstrap/blueprint-deptools/pkg/github.com/google/blueprint/deptools.a $ + .bootstrap/blueprint-pathtools/pkg/github.com/google/blueprint/pathtools.a $ + .bootstrap/blueprint-bootstrap/pkg/github.com/google/blueprint/bootstrap.a incFlags = -I .bootstrap/blueprint-parser/pkg -I .bootstrap/blueprint-proptools/pkg -I .bootstrap/blueprint/pkg -I .bootstrap/blueprint-deptools/pkg -I .bootstrap/blueprint-pathtools/pkg -I .bootstrap/blueprint-bootstrap/pkg pkgPath = minibp default .bootstrap/minibp/obj/minibp.a @@ -208,7 +226,7 @@ default .bootstrap/bin/minibp # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # Singleton: bootstrap -# Factory: blueprint/bootstrap.newSingleton +# Factory: github.com/google/blueprint/bootstrap.newSingleton rule s.bootstrap.bigbp command = .bootstrap/bin/minibp -p -d .bootstrap/main.ninja.in.d -m ${g.bootstrap.bootstrapManifest} -o ${out} ${in} diff --git a/context.go b/context.go index e576331..08fbc13 100644 --- a/context.go +++ b/context.go @@ -15,11 +15,11 @@ package blueprint import ( - "blueprint/parser" - "blueprint/proptools" "bytes" "errors" "fmt" + "github.com/google/blueprint/parser" + "github.com/google/blueprint/proptools" "io" "os" "path/filepath" @@ -720,7 +720,7 @@ func (c *Context) createVariations(origModule *moduleInfo, mutatorName string, if len(variationNames) == 0 { panic(fmt.Errorf("mutator %q passed zero-length variation list for module %q", - mutatorName, origModule.properties.Name)) + mutatorName, origModule.properties.Name)) } newModules := []*moduleInfo{} diff --git a/parser/printer_test.go b/parser/printer_test.go index 20fb747..e5acf06 100644 --- a/parser/printer_test.go +++ b/parser/printer_test.go @@ -133,11 +133,11 @@ baz += foo //test test /* test */ { srcs: [ - /*"blueprint/bootstrap/bootstrap.go", - "blueprint/bootstrap/cleanup.go",*/ - "blueprint/bootstrap/command.go", - "blueprint/bootstrap/doc.go", //doc.go - "blueprint/bootstrap/config.go", //config.go + /*"bootstrap/bootstrap.go", + "bootstrap/cleanup.go",*/ + "bootstrap/command.go", + "bootstrap/doc.go", //doc.go + "bootstrap/config.go", //config.go ], deps: ["libabc"], incs: [] @@ -153,11 +153,11 @@ test2 { //test test /* test */ { srcs: [ - /*"blueprint/bootstrap/bootstrap.go", - "blueprint/bootstrap/cleanup.go",*/ - "blueprint/bootstrap/command.go", - "blueprint/bootstrap/config.go", //config.go - "blueprint/bootstrap/doc.go", //doc.go + /*"bootstrap/bootstrap.go", + "bootstrap/cleanup.go",*/ + "bootstrap/command.go", + "bootstrap/config.go", //config.go + "bootstrap/doc.go", //doc.go ], deps: ["libabc"], incs: [], diff --git a/splice_modules_test.go b/splice_modules_test.go index 05cd81c..091f5bf 100644 --- a/splice_modules_test.go +++ b/splice_modules_test.go @@ -130,4 +130,4 @@ func TestSpliceModules(t *testing.T) { func sameArray(a, b []*moduleInfo) bool { return &a[0:cap(a)][cap(a)-1] == &b[0:cap(b)][cap(b)-1] -} \ No newline at end of file +} diff --git a/unpack.go b/unpack.go index f513a30..37bc158 100644 --- a/unpack.go +++ b/unpack.go @@ -15,9 +15,9 @@ package blueprint import ( - "blueprint/parser" - "blueprint/proptools" "fmt" + "github.com/google/blueprint/parser" + "github.com/google/blueprint/proptools" "reflect" "strings" ) diff --git a/unpack_test.go b/unpack_test.go index 4138d73..bd4dd8f 100644 --- a/unpack_test.go +++ b/unpack_test.go @@ -15,9 +15,9 @@ package blueprint import ( - "blueprint/parser" - "blueprint/proptools" "bytes" + "github.com/google/blueprint/parser" + "github.com/google/blueprint/proptools" "reflect" "testing" )