From cb8cf1ab48d0481cccd24cd0532545edb5d18946 Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Wed, 5 Oct 2016 10:59:50 -0700 Subject: [PATCH 1/2] Allow builds outside of GOPATH to work `go list` produces different results for vendored code when not under GOPATH. --- Makefile.generated_files | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Makefile.generated_files b/Makefile.generated_files index 13a4bbb87e6..6359f73e12a 100644 --- a/Makefile.generated_files +++ b/Makefile.generated_files @@ -273,14 +273,14 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN) $(META_DIR)/$(DEEPCOPY_GEN).mk: mkdir -p $(@D); \ (echo -n "$(DEEPCOPY_GEN): "; \ - DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/deepcopy-gen); \ - INDIRECT=$$(go list \ + INDIRECT=$$(./hack/run-in-gopath.sh go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/deepcopy-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \ @@ -424,14 +424,14 @@ $(DEFAULTER_FILES): $(DEFAULTER_GEN) $(META_DIR)/$(DEFAULTER_GEN).mk: mkdir -p $(@D); \ (echo -n "$(DEFAULTER_GEN): "; \ - DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/defaulter-gen); \ - INDIRECT=$$(go list \ + INDIRECT=$$(./hack/run-in-gopath.sh go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/defaulter-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \ @@ -531,14 +531,14 @@ $(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN) $(META_DIR)/$(OPENAPI_GEN).mk: mkdir -p $(@D); \ (echo -n "$(OPENAPI_GEN): "; \ - DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/openapi-gen); \ - INDIRECT=$$(go list \ + INDIRECT=$$(./hack/run-in-gopath.sh go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/openapi-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \ @@ -726,14 +726,14 @@ $(CONVERSION_FILES): $(CONVERSION_GEN) $(META_DIR)/$(CONVERSION_GEN).mk: mkdir -p $(@D); \ (echo -n "$(CONVERSION_GEN): "; \ - DIRECT=$$(go list -f '{{.Dir}} {{.Dir}}/*.go' \ + DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./cmd/libs/go2idl/conversion-gen); \ - INDIRECT=$$(go list \ + INDIRECT=$$(./hack/run-in-gopath.sh go list \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ ./cmd/libs/go2idl/conversion-gen \ | grep --color=never "^$(PRJ_SRC_PATH)" \ | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs go list -f '{{.Dir}} {{.Dir}}/*.go'); \ + | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ echo $$DIRECT $$INDIRECT \ | sed 's/ / \\=,/g' \ | tr '=,' '\n\t'; \ From ca1918ad314f53cd07dc9f09729873a0dd724d4d Mon Sep 17 00:00:00 2001 From: Tim Hockin Date: Fri, 30 Dec 2016 18:44:32 -0800 Subject: [PATCH 2/2] Remove a from each codegen path --- Makefile.generated_files | 108 +++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 56 deletions(-) diff --git a/Makefile.generated_files b/Makefile.generated_files index 6359f73e12a..fdeea32dd57 100644 --- a/Makefile.generated_files +++ b/Makefile.generated_files @@ -271,20 +271,19 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN) # file if the contents have actually changed. We 'sinclude' this later. .PHONY: $(META_DIR)/$(DEEPCOPY_GEN).mk $(META_DIR)/$(DEEPCOPY_GEN).mk: - mkdir -p $(@D); \ - (echo -n "$(DEEPCOPY_GEN): "; \ - DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ - ./cmd/libs/go2idl/deepcopy-gen); \ - INDIRECT=$$(./hack/run-in-gopath.sh go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/deepcopy-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ - | sed 's/ / \\=,/g' \ - | tr '=,' '\n\t'; \ - ) | sed "s|$$(pwd -P)/||" > $@.tmp; \ + mkdir -p $(@D); \ + (echo -n "$(DEEPCOPY_GEN): "; \ + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/deepcopy-gen \ + | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ + | sed 's/ / \\=,/g' \ + | tr '=,' '\n\t' \ + | sed "s|$$(pwd -P)/||"; \ + ) > $@.tmp; \ cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp # Include dependency info for the generator tool. This will cause the rule of @@ -422,20 +421,19 @@ $(DEFAULTER_FILES): $(DEFAULTER_GEN) # file if the contents have actually changed. We 'sinclude' this later. .PHONY: $(META_DIR)/$(DEFAULTER_GEN).mk $(META_DIR)/$(DEFAULTER_GEN).mk: - mkdir -p $(@D); \ - (echo -n "$(DEFAULTER_GEN): "; \ - DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ - ./cmd/libs/go2idl/defaulter-gen); \ - INDIRECT=$$(./hack/run-in-gopath.sh go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/defaulter-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ - | sed 's/ / \\=,/g' \ - | tr '=,' '\n\t'; \ - ) | sed "s|$$(pwd -P)/||" > $@.tmp; \ + mkdir -p $(@D); \ + (echo -n "$(DEFAULTER_GEN): "; \ + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/defaulter-gen \ + | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ + | sed 's/ / \\=,/g' \ + | tr '=,' '\n\t' \ + | sed "s|$$(pwd -P)/||"; \ + ) > $@.tmp; \ cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp # Include dependency info for the generator tool. This will cause the rule of @@ -529,20 +527,19 @@ $(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN) # file if the contents have actually changed. We 'sinclude' this later. .PHONY: $(META_DIR)/$(OPENAPI_GEN).mk $(META_DIR)/$(OPENAPI_GEN).mk: - mkdir -p $(@D); \ - (echo -n "$(OPENAPI_GEN): "; \ - DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ - ./cmd/libs/go2idl/openapi-gen); \ - INDIRECT=$$(./hack/run-in-gopath.sh go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/openapi-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ - | sed 's/ / \\=,/g' \ - | tr '=,' '\n\t'; \ - ) | sed "s|$$(pwd -P)/||" > $@.tmp; \ + mkdir -p $(@D); \ + (echo -n "$(OPENAPI_GEN): "; \ + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/openapi-gen \ + | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ + | sed 's/ / \\=,/g' \ + | tr '=,' '\n\t' \ + | sed "s|$$(pwd -P)/||"; \ + ) > $@.tmp; \ cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp # Include dependency info for the generator tool. This will cause the rule of @@ -724,20 +721,19 @@ $(CONVERSION_FILES): $(CONVERSION_GEN) # file if the contents have actually changed. We 'sinclude' this later. .PHONY: $(META_DIR)/$(CONVERSION_GEN).mk $(META_DIR)/$(CONVERSION_GEN).mk: - mkdir -p $(@D); \ - (echo -n "$(CONVERSION_GEN): "; \ - DIRECT=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ - ./cmd/libs/go2idl/conversion-gen); \ - INDIRECT=$$(./hack/run-in-gopath.sh go list \ - -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ - ./cmd/libs/go2idl/conversion-gen \ - | grep --color=never "^$(PRJ_SRC_PATH)" \ - | sed 's|^$(PRJ_SRC_PATH)|./|' \ - | xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ - echo $$DIRECT $$INDIRECT \ - | sed 's/ / \\=,/g' \ - | tr '=,' '\n\t'; \ - ) | sed "s|$$(pwd -P)/||" > $@.tmp; \ + mkdir -p $(@D); \ + (echo -n "$(CONVERSION_GEN): "; \ + ./hack/run-in-gopath.sh go list \ + -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ + ./cmd/libs/go2idl/conversion-gen \ + | grep --color=never "^$(PRJ_SRC_PATH)/" \ + | xargs ./hack/run-in-gopath.sh go list \ + -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \ + | paste -sd' ' - \ + | sed 's/ / \\=,/g' \ + | tr '=,' '\n\t' \ + | sed "s|$$(pwd -P)/||"; \ + ) > $@.tmp; \ cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp # Include dependency info for the generator tool. This will cause the rule of