github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Allow builds outside of GOPATH to work

Browse Source 
`go list` produces different results for vendored code when not under GOPATH.
This commit is contained in:
Tim Hockin 2016-10-05 10:59:50 -07:00
parent ef44fa1919
commit cb8cf1ab48
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Makefile.generated_files
View File

@ -273,14 +273,14 @@ $(DEEPCOPY_FILES): $(DEEPCOPY_GEN)
$(META_DIR)/$(DEEPCOPY_GEN).mk: $(META_DIR)/$(DEEPCOPY_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(DEEPCOPY_GEN): "; \ (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); \ ./cmd/libs/go2idl/deepcopy-gen); \
INDIRECT=$$(go list \ INDIRECT=$$(./hack/run-in-gopath.sh go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/deepcopy-gen \ ./cmd/libs/go2idl/deepcopy-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \
@ -424,14 +424,14 @@ $(DEFAULTER_FILES): $(DEFAULTER_GEN)
$(META_DIR)/$(DEFAULTER_GEN).mk: $(META_DIR)/$(DEFAULTER_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(DEFAULTER_GEN): "; \ (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); \ ./cmd/libs/go2idl/defaulter-gen); \
INDIRECT=$$(go list \ INDIRECT=$$(./hack/run-in-gopath.sh go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/defaulter-gen \ ./cmd/libs/go2idl/defaulter-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \
@ -531,14 +531,14 @@ $(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN)
$(META_DIR)/$(OPENAPI_GEN).mk: $(META_DIR)/$(OPENAPI_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(OPENAPI_GEN): "; \ (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); \ ./cmd/libs/go2idl/openapi-gen); \
INDIRECT=$$(go list \ INDIRECT=$$(./hack/run-in-gopath.sh go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/openapi-gen \ ./cmd/libs/go2idl/openapi-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \
@ -726,14 +726,14 @@ $(CONVERSION_FILES): $(CONVERSION_GEN)
$(META_DIR)/$(CONVERSION_GEN).mk: $(META_DIR)/$(CONVERSION_GEN).mk:
mkdir -p $(@D); \ mkdir -p $(@D); \
(echo -n "$(CONVERSION_GEN): "; \ (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); \ ./cmd/libs/go2idl/conversion-gen); \
INDIRECT=$$(go list \ INDIRECT=$$(./hack/run-in-gopath.sh go list \
-f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \ -f '{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
./cmd/libs/go2idl/conversion-gen \ ./cmd/libs/go2idl/conversion-gen \
| grep --color=never "^$(PRJ_SRC_PATH)" \ | grep --color=never "^$(PRJ_SRC_PATH)" \
| sed 's|^$(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 \ echo $$DIRECT $$INDIRECT \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t'; \