github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-07 19:23:40 +00:00
Code Issues Projects Releases Wiki Activity

Remove verify_gen_openapi make rule.

Browse Source
This commit is contained in:
Joe Finney 2017-02-07 15:56:25 -08:00
parent 48fc03b8f2
commit 3bc3e410b8
3 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -110,6 +110,7 @@ kubernetes.tar.gz
# generated files in any directory # generated files in any directory
# TODO(thockin): uncomment this when we stop committing the generated files. # TODO(thockin): uncomment this when we stop committing the generated files.
#zz_generated.* #zz_generated.*
zz_generated.openapi.go
# make-related metadata # make-related metadata
/.make/ /.make/

2
Makefile
View File

@ -287,6 +287,8 @@ clean: clean_meta
build/make-clean.sh build/make-clean.sh
rm -rf $(OUT_DIR) rm -rf $(OUT_DIR)
rm -rf Godeps/_workspace # Just until we are sure it is gone rm -rf Godeps/_workspace # Just until we are sure it is gone
# TODO(thockin): Remove this when we call clean_generated.
rm -f pkg/generated/openapi/zz_generated.openapi.go
endif endif
define CLEAN_META_HELP_INFO define CLEAN_META_HELP_INFO

31
Makefile.generated_files
View File

@ -40,8 +40,7 @@ generated_files: gen_deepcopy gen_defaulter gen_conversion gen_openapi
.PHONY: verify_generated_files .PHONY: verify_generated_files
verify_generated_files: verify_gen_deepcopy \ verify_generated_files: verify_gen_deepcopy \
verify_gen_defaulter \ verify_gen_defaulter \
verify_gen_conversion \ verify_gen_conversion
verify_gen_openapi
# Code-generation logic. # Code-generation logic.
# #
@ -480,27 +479,10 @@ OPENAPI_DIRS := $(shell \
OPENAPI_OUTFILE := $(OPENAPI_OUTPUT_PKG)/$(OPENAPI_FILENAME) OPENAPI_OUTFILE := $(OPENAPI_OUTPUT_PKG)/$(OPENAPI_FILENAME)
# Shell function for reuse in rules.
RUN_GEN_OPENAPI = \
function run_gen_openapi() { \
./hack/run-in-gopath.sh $(OPENAPI_GEN) \
--v $(KUBE_VERBOSE) \
--logtostderr \
-i $$(echo $(addprefix $(PRJ_SRC_PATH)/, $(OPENAPI_DIRS)) | sed 's/ /,/g') \
-p $(PRJ_SRC_PATH)/$(OPENAPI_OUTPUT_PKG) \
-O $(OPENAPI_BASENAME) \
"$$@"; \
}; \
run_gen_openapi
# This rule is the user-friendly entrypoint for openapi generation. # This rule is the user-friendly entrypoint for openapi generation.
.PHONY: gen_openapi .PHONY: gen_openapi
gen_openapi: $(OPENAPI_OUTFILE) $(OPENAPI_GEN) gen_openapi: $(OPENAPI_OUTFILE) $(OPENAPI_GEN)
.PHONY: verify_gen_openapi
verify_gen_openapi: $(OPENAPI_GEN)
$(RUN_GEN_OPENAPI) --verify-only
# For each dir in OPENAPI_DIRS, this establishes a dependency between the # For each dir in OPENAPI_DIRS, this establishes a dependency between the
# output file and the input files that should trigger a rebuild. # output file and the input files that should trigger a rebuild.
# #
@ -520,7 +502,16 @@ $(foreach dir, $(OPENAPI_DIRS), $(eval \
# How to regenerate open-api code. This emits a single file for all results. # How to regenerate open-api code. This emits a single file for all results.
$(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN) $(OPENAPI_OUTFILE): $(OPENAPI_GEN) $(OPENAPI_GEN)
$(RUN_GEN_OPENAPI) function run_gen_openapi() { \
./hack/run-in-gopath.sh $(OPENAPI_GEN) \
--v $(KUBE_VERBOSE) \
--logtostderr \
-i $$(echo $(addprefix $(PRJ_SRC_PATH)/, $(OPENAPI_DIRS)) | sed 's/ /,/g') \
-p $(PRJ_SRC_PATH)/$(OPENAPI_OUTPUT_PKG) \
-O $(OPENAPI_BASENAME) \
"$$@"; \
}; \
run_gen_openapi
# This calculates the dependencies for the generator tool, so we only rebuild # This calculates the dependencies for the generator tool, so we only rebuild
# it when needed. It is PHONY so that it always runs, but it only updates the # it when needed. It is PHONY so that it always runs, but it only updates the