Added Help menu with doc link and About modal.

[src/xds/xds-agent.git] / Makefile

diff --git a/Makefile b/Makefile
index 18638c6..466017f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,14 @@ PACKAGE_DIR := $(ROOT_SRCDIR)/package
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
 export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
+# Check Go version
+GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
+GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
+GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
+CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))."
+
+
 VERBOSE_1 := -v
 VERBOSE_2 := -v -x
 
@@ -53,24 +61,26 @@ ifeq ($(filter 1,$(RELEASE) $(REL)),)
        # disable compiler optimizations and inlining
        GO_GCFLAGS=-N -l
        BUILD_MODE="Debug mode"
+       WEBAPP_BUILD_RULE=build
 else
        # optimized code without debug info
        GO_LDFLAGS=-s -w
        GO_GCFLAGS=
        BUILD_MODE="Release mode"
+       WEBAPP_BUILD_RULE=build:prod
 endif
 
 ifeq ($(SUB_VERSION), )
-       PACKAGE_ZIPFILE := xds-agent_$(ARCH)-v$(VERSION).zip
+       PACKAGE_ZIPFILE := xds-agent_$(ARCH)-$(VERSION).zip
 else
-       PACKAGE_ZIPFILE := xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+       PACKAGE_ZIPFILE := xds-agent_$(ARCH)-$(VERSION)_$(SUB_VERSION).zip
 endif
 
 
 all: tools/syncthing build
 
 .PHONY: build
-build: vendor xds webapp
+build: checkgover vendor xds webapp
 
 xds: scripts tools/syncthing/copytobin
        @echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
@@ -100,10 +110,10 @@ distclean: clean
        cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
 
 webapp: webapp/install
-       (cd webapp && gulp build)
+       cd webapp && npm run $(WEBAPP_BUILD_RULE)
 
 webapp/debug:
-       (cd webapp && gulp watch &)
+       cd webapp && npm run watch
 
 webapp/install:
        (cd webapp && npm install)
@@ -120,10 +130,12 @@ uninstall:
        export DESTDIR=$(DESTDIR) && export DESTDIR_WWW=$(DESTDIR_WWW) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
 
 package: clean tools/syncthing vendor build
-       @mkdir -p $(PACKAGE_DIR)/xds-agent $(PACKAGE_DIR)/scripts
-       @cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent
-       @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/xds-agent
-       cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
+       @mkdir -p $(PACKAGE_DIR)/xds-agent/www $(PACKAGE_DIR)/scripts
+       @cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent/
+       @cp -a webapp/dist/* $(PACKAGE_DIR)/xds-agent/www/
+       @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/xds-agent/
+       @cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
+       @echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)"
 
 .PHONY: package-all
 package-all:
@@ -140,7 +152,8 @@ vendor: tools/glide glide.yaml
 
 vendor/debug: vendor
        (cd vendor/github.com/iotbzh && \
-               rm -rf xds-common && ln -s ../../../../xds-common )
+               rm -rf xds-common && ln -s ../../../../xds-common \
+               rm -rf xds-server && ln -s ../../../../xds-server )
 
 .PHONY: tools/glide
 tools/glide:
@@ -165,6 +178,11 @@ tools/syncthing/copytobin:
        @mkdir -p $(LOCAL_BINDIR)
        @cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR)
 
+.PHONY:
+checkgover:
+       @test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
+
+
 .PHONY: help
 help:
        @echo "Main supported rules:"