X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=fc6a603bc0b36f6759d2faba1c88bce8f275587f;hb=b300a0413e9658aa2d9ebe0d4cddadc51881112a;hp=fa86c370da22cbdc9d2bf7d80070c27744101f3c;hpb=bfeab33538d50ee52750de4dd4c0e72b64f674f6;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index fa86c37..fc6a603 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,10 @@
 VERSION := 0.0.1
 
 # Syncthing version to install
-SYNCTHING_VERSION = 0.14.27
-SYNCTHING_INOTIFY_VERSION = 0.8.5
+SYNCTHING_VERSION = 0.14.28
+# FIXME: use patched version while waiting integration of #165
+#SYNCTHING_INOTIFY_VERSION = 0.8.5
+SYNCTHING_INOTIFY_VERSION = master
 
 
 
@@ -27,30 +29,45 @@ HOST_GOARCH=$(shell go env GOARCH)
 ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
 REPOPATH=github.com/iotbzh/xds-agent
 
+EXT=
+ifeq ($(HOST_GOOS), windows)
+	EXT=.exe
+endif
+
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
 ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
 LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
+LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
 
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
-export PATH := $(PATH):$(ROOT_SRCDIR)/tools
+export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
 VERBOSE_1 := -v
 VERBOSE_2 := -v -x
 
+# Release or Debug mode
+ifeq ($(filter 1,$(RELEASE) $(REL)),)
+	GORELEASE=
+	BUILD_MODE="Debug mode"
+else
+	# optimized code without debug info
+	GORELEASE= -s -w
+	BUILD_MODE="Release mode"
+endif
 
-all: build
+all: tools/syncthing build
 
-build: vendor tools/syncthing
-	@echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION))";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent -ldflags "-X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
+build: vendor 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 "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
 package: clean build
 	@mkdir -p $(PACKAGE_DIR)/xds-agent
 	@cp agent-config.json.in $(PACKAGE_DIR)/xds-agent/agent-config.json
 	@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/xds-agent
-	cd $(PACKAGE_DIR) && zip -r $(LOCAL_BINDIR)/xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip ./xds-agent
+	cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip ./xds-agent
 
 test: tools/glide
 	go test --race $(shell ./tools/glide novendor)
@@ -61,11 +78,11 @@ vet: tools/glide
 fmt: tools/glide
 	go fmt $(shell ./tools/glide novendor)
 
-run: build/xds tools/syncthing
-	$(LOCAL_BINDIR)/xds-agent --log info -c agent-config.json.in
+run: build/xds tools/syncthing/copytobin
+	$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
 
-debug: build/xds tools/syncthing
-	$(LOCAL_BINDIR)/xds-agent --log debug -c agent-config.json.in
+debug: build/xds tools/syncthing/copytobin
+	$(LOCAL_BINDIR)/xds-agent$(EXT) --log debug -c agent-config.json.in
 
 .PHONY: clean
 clean:
@@ -73,7 +90,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) tools glide.lock vendor
+	rm -rf $(LOCAL_BINDIR) tools glide.lock vendor $(ROOT_SRCDIR)/*.zip
 
 .PHONY: install
 install: all
@@ -89,11 +106,18 @@ tools/glide:
 
 .PHONY: tools/syncthing
 tools/syncthing:
-	@(test -s $(LOCAL_BINDIR)/syncthing || \
-	DESTDIR=$(LOCAL_BINDIR) \
+	@test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT)  || { \
+	mkdir -p $(LOCAL_TOOLSDIR); \
+	DESTDIR=$(LOCAL_TOOLSDIR) \
 	SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
 	SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
-	./scripts/get-syncthing.sh)
+	./scripts/get-syncthing.sh; }
+
+.PHONY:
+tools/syncthing/copytobin:
+	@test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make tools/syncthing\n"; exit 1; }
+	@mkdir -p $(LOCAL_BINDIR)
+	@cp -f $(LOCAL_TOOLSDIR)/syncthing$(EXT) $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) $(LOCAL_BINDIR)
 
 .PHONY: help
 help: