Merge ~ballot/content-cache-charm/+git/content-cache-charm:update_makefile into content-cache-charm:master

[Benjamin Allot]

Update "make build" target

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Benjamin Allot (ballot)]

This allow a cleaner charm build, inspired by ngfw target

[Nick Moffitt (nick-moffitt)]

seems legit

review: Approve

[Joel Sing (jsing)]

LGTM

review: Approve (+1)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 230c2e3fa814dc25a6ff5a61ec93c7f43bb4d1a6

diff --git a/Makefile b/Makefile
index 170a4bf..8190269 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,11 @@
+CHARM_REPO = git+ssh://git.launchpad.net/content-cache-charm
+CHARM_NAME = $(shell awk '/^name:/ { print $$2 }' metadata.yaml)
+CHARM_BUILD_DIR ?= ~/tmp
+CHARM_DEST_DIR ?= $(CHARM_BUILD_DIR)/$(CHARM_NAME)
+
+$(CHARM_BUILD_DIR):
+	mkdir -p $@
+
 help:
 	@echo "This project supports the following targets"
 	@echo ""
@@ -24,11 +32,21 @@ unittest:
 functional: build
 	@tox -e functional
 
-build: clean
-	@echo "Building charm to base directory $(JUJU_REPOSITORY)"
-	@-git describe --always --dirty --tags > ./repo-info
-	@LAYER_PATH=./layers INTERFACE_PATH=./interfaces TERM=linux \
-		JUJU_REPOSITORY=$(JUJU_REPOSITORY) charm build . --force
+build: clean | $(CHARM_BUILD_DIR)
+	$(eval TMP_CHARM_BUILD_DIR = $(shell mktemp -d -p $(CHARM_BUILD_DIR) charm-build.$(CHARM_NAME).XXXXXXXX))
+	@if [ -z $(CHARM_NAME) ]; then \
+		echo "Unable to work out charm name from metadata.yaml"; \
+		exit 1; \
+	fi
+	charm build -o $(TMP_CHARM_BUILD_DIR)
+	if [ -d $(CHARM_DEST_DIR)/ ]; then \
+		git -C $(CHARM_DEST_DIR)/ pull; \
+	else \
+		git clone -- $(CHARM_REPO) $(CHARM_DEST_DIR)/; \
+	fi
+	rsync -a --exclude .git --delete -- $(TMP_CHARM_BUILD_DIR)/builds/$(CHARM_NAME)/ $(CHARM_DEST_DIR)/
+	@echo "Built charm in $(CHARM_DEST_DIR)"
+	rm -rf -- $(TMP_CHARM_BUILD_DIR)
 
 clean:
 	@echo "Cleaning files"