X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=d088c5d5c0bd203c1333bbd32973bbf81efcad33;hb=e113bbc75f88457d29f11823af0ff902e7c2ac8b;hp=2f7ad2de0c46c53f9fd0e85e12a7ed52f5371e71;hpb=17f976697a26ea2865ebf8529b0115581ea048c9;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 2f7ad2d..d088c5d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,31 +5,37 @@ VERSION := 0.1.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.28
-# FIXME: use master while waiting a release that include #164
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION=master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
 
 
 # Retrieve git tag/commit to set sub-version string
 ifeq ($(origin SUB_VERSION), undefined)
-	SUB_VERSION := $(shell git describe --tags 2>/dev/null | sed 's/^v//')
+	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)))
 	else
-		SUB_VERSION := $(shell git describe --tags --always  | sed 's/^v//')
+		SUB_VERSION := $(shell git rev-parse --short HEAD)
 		ifeq ($(SUB_VERSION), )
 			SUB_VERSION := unknown-dev
 		endif
 	endif
 endif
 
+# for backward compatibility
+ifneq ($(origin INSTALL_DIR), undefined)
+	DESTDIR := $(INSTALL_DIR)
+endif
+ifneq ($(origin INSTALL_WEBAPP_DIR), undefined)
+	DESTDIR_WWW := $(INSTALL_WEBAPP_DIR)
+endif
+
 # Configurable variables for installation (default /usr/local/...)
-ifeq ($(origin INSTALL_DIR), undefined)
-	INSTALL_DIR := /usr/local/bin
+ifeq ($(origin DESTDIR), undefined)
+	DESTDIR := /usr/local/bin
 endif
-ifeq ($(origin INSTALL_WEBAPP_DIR), undefined)
-	INSTALL_WEBAPP_DIR := $(INSTALL_DIR)/www-xds-server
+ifeq ($(origin DESTDIR_WWW), undefined)
+	DESTDIR_WWW := $(DESTDIR)/www-xds-server
 endif
 
 HOST_GOOS=$(shell go env GOOS)
@@ -46,10 +52,9 @@ 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
+LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
 
-
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
 export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
@@ -76,9 +81,9 @@ endif
 all: tools/syncthing build
 
 .PHONY: build
-build: xds webapp
+build: vendor xds webapp
 
-xds:vendor scripts tools/syncthing/copytobin
+xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
@@ -103,7 +108,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) $(LOCAL_TOOLSDIR) glide.lock vendor webapp/node_modules webapp/dist
+	rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist
 
 webapp: webapp/install
 	(cd webapp && gulp build)
@@ -113,6 +118,7 @@ webapp/debug:
 
 webapp/install:
 	(cd webapp && npm install)
+	@if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
 
 .PHONY: scripts
 scripts:
@@ -121,24 +127,24 @@ scripts:
 .PHONY: conffile
 conffile:
 	cat config.json.in \
-		| sed -e s,"webapp/dist","$(INSTALL_WEBAPP_DIR)",g \
+		| sed -e s,"webapp/dist","$(DESTDIR_WWW)",g \
 		| sed -e s,"\./bin","",g \
-		 > $(PACKAGE_DIR)/xds-server/config.json
+		 > $(DESTDIR)/config.json
 
 .PHONY: install
 install:
 	@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
 	@test -e $(LOCAL_BINDIR)/xds-server-start.sh -a -d $(LOCAL_BINDIR)/xds-utils || { 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; }
-	mkdir -p $(INSTALL_DIR) \
-		&& cp -a $(LOCAL_BINDIR)/* $(INSTALL_DIR)
-	mkdir -p $(INSTALL_WEBAPP_DIR) \
-		&& cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
+	mkdir -p $(DESTDIR) \
+		&& cp -a $(LOCAL_BINDIR)/* $(DESTDIR)
+	mkdir -p $(DESTDIR_WWW) \
+		&& cp -a webapp/dist/* $(DESTDIR_WWW)
 
 .PHONY: package
 package: clean
-	INSTALL_DIR=$(PACKAGE_DIR)/xds-server make -f $(ROOT_SRCDIR)/Makefile all install
-	INSTALL_DIR=$(PACKAGE_DIR)/xds-server INSTALL_WEBAPP_DIR=www-xds-server	make -f $(ROOT_SRCDIR)/Makefile conffile
+	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
 	(cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server)
 
 .PHONY: package-all
@@ -151,10 +157,13 @@ package-all:
 vendor: tools/glide glide.yaml
 	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
+.PHONY: tools/glide
 tools/glide:
-	@echo "Downloading glide"
-	mkdir -p $(LOCAL_TOOLSDIR)
-	curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh
+	@test -f $(LOCAL_TOOLSDIR)/glide || { \
+		echo "Downloading glide"; \
+		mkdir -p $(LOCAL_TOOLSDIR); \
+		curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
+	}
 
 .PHONY: tools/syncthing
 tools/syncthing: