github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Remove a from each codegen path

Browse Source
This commit is contained in:
Tim Hockin 2016-12-30 18:44:32 -08:00
parent cb8cf1ab48
commit ca1918ad31
1 changed files with 52 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Makefile.generated_files
View File

@ -273,18 +273,17 @@ $(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=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./hack/run-in-gopath.sh go list \
./cmd/libs/go2idl/deepcopy-gen); \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
INDIRECT=$$(./hack/run-in-gopath.sh go list \
-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)|./|' \ | xargs ./hack/run-in-gopath.sh go list \
| xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \
echo $$DIRECT $$INDIRECT \ | paste -sd' ' - \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t' \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ | sed "s|$$(pwd -P)/||"; \
) > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
# Include dependency info for the generator tool. This will cause the rule of # Include dependency info for the generator tool. This will cause the rule of
@ -424,18 +423,17 @@ $(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=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./hack/run-in-gopath.sh go list \
./cmd/libs/go2idl/defaulter-gen); \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
INDIRECT=$$(./hack/run-in-gopath.sh go list \
-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)|./|' \ | xargs ./hack/run-in-gopath.sh go list \
| xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \
echo $$DIRECT $$INDIRECT \ | paste -sd' ' - \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t' \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ | sed "s|$$(pwd -P)/||"; \
) > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
# Include dependency info for the generator tool. This will cause the rule of # Include dependency info for the generator tool. This will cause the rule of
@ -531,18 +529,17 @@ $(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=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./hack/run-in-gopath.sh go list \
./cmd/libs/go2idl/openapi-gen); \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
INDIRECT=$$(./hack/run-in-gopath.sh go list \
-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)|./|' \ | xargs ./hack/run-in-gopath.sh go list \
| xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \
echo $$DIRECT $$INDIRECT \ | paste -sd' ' - \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t' \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ | sed "s|$$(pwd -P)/||"; \
) > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
# Include dependency info for the generator tool. This will cause the rule of # Include dependency info for the generator tool. This will cause the rule of
@ -726,18 +723,17 @@ $(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=$$(./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go' \ ./hack/run-in-gopath.sh go list \
./cmd/libs/go2idl/conversion-gen); \ -f '{{.ImportPath}}{{"\n"}}{{range .Deps}}{{.}}{{"\n"}}{{end}}' \
INDIRECT=$$(./hack/run-in-gopath.sh go list \
-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)|./|' \ | xargs ./hack/run-in-gopath.sh go list \
| xargs ./hack/run-in-gopath.sh go list -f '{{.Dir}} {{.Dir}}/*.go'); \ -f '{{$$d := .Dir}}{{$$d}}{{"\n"}}{{range .GoFiles}}{{$$d}}/{{.}}{{"\n"}}{{end}}' \
echo $$DIRECT $$INDIRECT \ | paste -sd' ' - \
| sed 's/ / \\=,/g' \ | sed 's/ / \\=,/g' \
| tr '=,' '\n\t'; \ | tr '=,' '\n\t' \
) | sed "s|$$(pwd -P)/||" > $@.tmp; \ | sed "s|$$(pwd -P)/||"; \
) > $@.tmp; \
cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp cmp -s $@.tmp $@ || cat $@.tmp > $@ && rm -f $@.tmp
# Include dependency info for the generator tool. This will cause the rule of # Include dependency info for the generator tool. This will cause the rule of