From 1499569abc3e8440592add96f96e01791282a246 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Sat, 24 Feb 2018 11:03:14 +0100 Subject: Optimized/Reduced packaging time Signed-off-by: Sebastien Douheret --- Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd5294c..1fc5558 100644 --- a/Makefile +++ b/Makefile @@ -132,13 +132,21 @@ distclean: clean cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist webapp: webapp/install +ifneq ($(SKIP_WEBAPP_BUILD), true) cd webapp && npm run $(WEBAPP_BUILD_RULE) +else + @echo "Skipping webapp build (SKIP_WEBAPP_BUILD var is set)" +endif webapp/debug: cd webapp && npm run watch webapp/install: +ifneq ($(SKIP_WEBAPP_BUILD), true) (cd webapp && npm install) +else + @echo "Skipping webapp install (SKIP_WEBAPP_BUILD var is set)" +endif @if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi .PHONY: install @@ -167,9 +175,9 @@ package-all: @echo "# Build linux amd64..." GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package @echo "# Build windows amd64..." - GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package + GOOS=windows GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package @echo "# Build darwin amd64..." - GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package + GOOS=darwin GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package make -f $(ROOT_SRCDIR)/Makefile clean vendor: tools/glide glide.yaml -- cgit 1.2.3-korg