From ecdeff27e3e6aee3f9f709dec89f45b4fce13f84 Mon Sep 17 00:00:00 2001 From: Joe Rocklin Date: Wed, 24 Oct 2018 10:49:02 -0400 Subject: [PATCH 1/2] Make references to codegen not require installation `make codegen` now builds a new version of the codegen tool before trying to run it. The command also now looks to a binary in the code-generation directory instead of requiring installation. This also adds a `go fmt` command to the code generation to remove formatting diffs from the bindata generation stage. --- Makefile | 8 ++++++-- code-generation/Makefile | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f033fde90..c78ce9bb3 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,13 @@ tag: install-aws-codegen: ${MAKE} -C code-generation install +.PHONY: build-codegen +build-codegen: + ${MAKE} -C code-generation rebuild + .PHONY: aws-codegen -aws-codegen: - aws-service-operator-codegen process +aws-codegen: build-codegen + ./code-generation/aws-service-operator-codegen process .PHONY: k8s-codegen k8s-codegen: diff --git a/code-generation/Makefile b/code-generation/Makefile index ec204c842..d3584e581 100644 --- a/code-generation/Makefile +++ b/code-generation/Makefile @@ -16,6 +16,7 @@ install-bindata: .PHONY: update-bindata update-bindata: go generate ./pkg/codegen/ + go fmt ./... .PHONY: rebuild rebuild: update-bindata build From ece53418f0fb2b31727e4c0e032b3a1a01292d2b Mon Sep 17 00:00:00 2001 From: Joe Rocklin Date: Wed, 24 Oct 2018 11:12:11 -0400 Subject: [PATCH 2/2] Only do code-gen app rebuild on full rebuild command --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index c78ce9bb3..b31662ebc 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ build-codegen: ${MAKE} -C code-generation rebuild .PHONY: aws-codegen -aws-codegen: build-codegen +aws-codegen: ./code-generation/aws-service-operator-codegen process .PHONY: k8s-codegen @@ -43,4 +43,4 @@ k8s-codegen: codegen: aws-codegen k8s-codegen .PHONY: rebuild -rebuild: codegen build +rebuild: build-codegen codegen build