From 61c71859b6db3d86bf835559d05007e4d82c4aa9 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 1 Oct 2020 12:04:45 +0200
Subject: [PATCH] Move provision codegen to (separate) makefile

---
 Makefile           | 16 +++++++++++++---
 codegen.sh         |  8 --------
 provision/Makefile | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 provision/Makefile

diff --git a/Makefile b/Makefile
index 3af38e587..cab38ac53 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: pack build help qa critic vet codegen
+.PHONY: pack build help qa critic vet codegen provision
 
 GO         = go
 GOGET      = $(GO) get -u
@@ -9,6 +9,7 @@ export GOFLAGS
 
 BUILD_FLAVOUR         ?= corteza
 BUILD_APPS            ?= system compose messaging monolith
+BUILD_APPS_TEMP       ?= system compose messaging
 BUILD_TIME            ?= $(shell date +%FT%T%z)
 BUILD_VERSION         ?= $(shell git describe --tags --abbrev=0)
 BUILD_ARCH            ?= $(shell go env GOARCH)
@@ -66,11 +67,12 @@ GOTEST      = $(GOPATH)/bin/gotest
 STATICCHECK = $(GOPATH)/bin/staticcheck
 PROTOGEN    = $(GOPATH)/bin/protoc-gen-go
 GIN         = $(GOPATH)/bin/gin
+STATIK      = $(GOPATH)/bin/statik
 CODEGEN     = build/codegen
 FSWATCH     = /usr/local/bin/fswatch
 
 # fswatch is intentionally left out...
-BINS = $(GOCRITIC) $(MOCKGEN) $(GOTEST) $(STATICCHECK) $(PROTOGEN) $(GIN) $(CODEGEN)
+BINS = $(GOCRITIC) $(MOCKGEN) $(GOTEST) $(STATICCHECK) $(PROTOGEN) $(GIN) $(STATIK) $(CODEGEN)
 
 help:
 	@echo
@@ -148,10 +150,13 @@ codegen: $(CODEGEN)
 watch.codegen: $(CODEGEN)
 	@ $(CODEGEN) -w -v
 
-
 clean.codegen:
 	rm -f $(CODEGEN)
 
+provision:
+	$(MAKE) --directory=provision clean all
+
+
 #######################################################################################################################
 # Quality Assurance
 
@@ -226,9 +231,14 @@ $(GIN):
 $(GOTEST):
 	$(GOGET) github.com/rakyll/gotest
 
+$(STATIK):
+	$(GOGET) github.com/goware/statik
+
 $(CODEGEN):
 	$(GO) build -o $@ cmd/codegen/main.go
 
+
+
 # @todo this will most likely need some special care for other platforms
 $(FSWATCH):
 	ifeq ($(UNAME_S),Darwin)
diff --git a/codegen.sh b/codegen.sh
index e20e91c70..15c7854b5 100755
--- a/codegen.sh
+++ b/codegen.sh
@@ -18,14 +18,6 @@ function green {
 	echo -e "\033[32m$@\033[39m"
 }
 
-function provision {
-	yellow "> provision files"
-	for FOLDER in system compose messaging; do
-   	$GOPATH/bin/statik -p $FOLDER -m -Z -f -src="./provision/$FOLDER/src" -dest "./provision"
-	done
-	green "OK"
-}
-
 function proto {
 	yellow "> proto"
 
diff --git a/provision/Makefile b/provision/Makefile
new file mode 100644
index 000000000..1d230c5eb
--- /dev/null
+++ b/provision/Makefile
@@ -0,0 +1,16 @@
+.PHONY: clean statik
+
+PARTS   ?= compose messaging system
+OUTPUTS ?= $(addsuffix /static.go, $(PARTS))
+STATIK   = $(GOPATH)/bin/statik
+
+all: $(OUTPUTS)
+
+%/static.go: $(STATIK)
+	$(STATIK) -p $(@D) -m -Z -f -src=$(@D)/src
+
+clean:
+	rm -f $(OUTPUTS)
+
+$(STATIK):
+	$(MAKE) --directory=../ $(STATIK)