X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=898b5528f00ef16ea99c61b2db6081986d18d037;hb=57bdfc8349b3c8a727d6f439e1fd12661bc00a15;hp=db4d87445a94b03a7ee32983447cd4098fb25359;hpb=2d90eac319979dba64371258b30e61e77a15db7d;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index db4d874..898b552 100644
--- a/Makefile
+++ b/Makefile
@@ -1,26 +1,41 @@
-# Makefile used to build XDS daemon Web Server
+ ###########################################################################
+# Copyright 2017 IoT.bzh
+#
+# author: Sebastien Douheret <sebastien@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+# Application Name
+TARGET=xds-agent
 
-# Application Version
-VERSION := 0.2.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.38
 SYNCTHING_INOTIFY_VERSION = 0.8.7
 
 
-# Retrieve git tag/commit to set sub-version string
-ifeq ($(origin SUB_VERSION), undefined)
-	SUB_VERSION := $(shell git describe --exact-match --tags 2>/dev/null | sed 's/^v//')
-	ifneq ($(SUB_VERSION), )
-		VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
-		SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
-	endif
-	ifeq ($(SUB_VERSION), )
-		SUB_VERSION := $(shell git rev-parse --short HEAD)
-		ifeq ($(SUB_VERSION), )
-			SUB_VERSION := unknown-dev
-		endif
-	endif
+# Retrieve git tag/commit to set version & sub-version strings
+GIT_DESC := $(shell git describe --always --tags)
+VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
+ifeq (-,$(findstring -,$(GIT_DESC)))
+	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
+endif
+ifeq ($(VERSION), )
+	VERSION := unknown-dev
+endif
+ifeq ($(SUB_VERSION), )
+	SUB_VERSION := $(shell date +'%Y-%m-%d_%H%M%S')
 endif
 
 # Configurable variables for installation (default /opt/AGL/...)
@@ -34,7 +49,7 @@ endif
 HOST_GOOS=$(shell go env GOOS)
 HOST_GOARCH=$(shell go env GOARCH)
 ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=github.com/iotbzh/xds-agent
+REPOPATH=github.com/iotbzh/$(TARGET)
 
 EXT=
 ifeq ($(HOST_GOOS), windows)
@@ -51,6 +66,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
 
@@ -60,28 +83,30 @@ 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 := $(TARGET)_$(ARCH)-$(VERSION).zip
 else
-	PACKAGE_ZIPFILE := xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+	PACKAGE_ZIPFILE := $(TARGET)_$(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)";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
+	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
 
 test: tools/glide
 	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
@@ -93,10 +118,10 @@ fmt: tools/glide
 	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 run: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS)
 
 debug: build/xds tools/syncthing/copytobin
-	$(LOCAL_BINDIR)/xds-agent$(EXT) --log debug -c agent-config.json.in
+	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_AGENT_DEBUG_ARGS)
 
 .PHONY: clean
 clean:
@@ -107,10 +132,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)
@@ -118,7 +143,7 @@ webapp/install:
 
 .PHONY: install
 install:
-	@test -e $(LOCAL_BINDIR)/xds-agent$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
+	@test -e $(LOCAL_BINDIR)/$(TARGET)$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
 	@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
 	export DESTDIR=$(DESTDIR) && export DESTDIR_WWW=$(DESTDIR_WWW) && $(ROOT_SRCDIR)/scripts/install.sh
 
@@ -127,10 +152,15 @@ 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)/$(TARGET)/www $(PACKAGE_DIR)/scripts
+	@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/$(TARGET)/
+	@cp -a webapp/dist/* $(PACKAGE_DIR)/$(TARGET)/www/
+ifneq ($(GOOS), windows)
+		@cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)/
+endif
+	@cp $(ROOT_SRCDIR)/conf.d/etc/xds/agent/agent-config.json $(PACKAGE_DIR)/$(TARGET)/agent-config.json.in
+	@cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET)
+	@echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)"
 
 .PHONY: package-all
 package-all:
@@ -147,7 +177,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:
@@ -172,6 +203,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:"