From a6c0798d147f0c9758c169626b25b3ecd75456a2 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Wed, 30 Aug 2017 21:53:10 +0200 Subject: [PATCH] Remove Windows package generation (not supported) Signed-off-by: Sebastien Douheret --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e3702b7..c46aaf4 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ clean: .PHONY: distclean distclean: clean - rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist + rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist webapp/assets/xds-agent-tarballs/*.zip webapp: webapp/install (cd webapp && gulp build) @@ -146,14 +146,14 @@ install: package: clean make -f $(ROOT_SRCDIR)/Makefile all install DESTDIR=$(PACKAGE_DIR)/xds-server make -f $(ROOT_SRCDIR)/Makefile conffile DESTDIR=$(PACKAGE_DIR)/xds-server DESTDIR_WWW=www-xds-server + rm -f $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) (cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server) .PHONY: package-all 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 + make -f $(ROOT_SRCDIR)/Makefile clean vendor: tools/glide glide.yaml $(LOCAL_TOOLSDIR)/glide install --strip-vendor -- 2.16.6