X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=b077bc712bcb2b1c317b7be55d9f123fb1c7a587;hb=51da3506a296b7d5d4185b17364f188292136888;hp=5a9646e8dd828b2467e18d9867097d13af9fa47d;hpb=9f6d0e831bd8fae07118ba26a61f4fdf8e8bc655;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 5a9646e..b077bc7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,8 @@ VERSION := 0.0.1
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.27
-SYNCTHING_INOTIFY_VERSION = 0.8.5
+# FIXME: use patched version while waiting integration of #165
+#SYNCTHING_INOTIFY_VERSION = 0.8.5
 
 
 # Retrieve git tag/commit to set sub-version string
@@ -32,9 +33,11 @@ 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
+
 
 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
@@ -50,13 +53,13 @@ xds:vendor scripts
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server -ldflags "-X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
 test: tools/glide
-	go test --race $(shell ./tools/glide novendor)
+	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 vet: tools/glide
-	go vet $(shell ./tools/glide novendor)
+	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 fmt: tools/glide
-	go fmt $(shell ./tools/glide novendor)
+	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 run: build/xds tools/syncthing
 	$(LOCAL_BINDIR)/xds-server --log info -c config.json.in
@@ -70,7 +73,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) tools glide.lock vendor webapp/node_modules webapp/dist
+	rm -rf $(LOCAL_BINDIR) $(LOCAL_TOOLSDIR) glide.lock vendor webapp/node_modules webapp/dist
 
 webapp: webapp/install
 	(cd webapp && gulp build)
@@ -83,25 +86,28 @@ webapp/install:
 
 .PHONY: scripts
 scripts:
-	@mkdir -p $(LOCAL_BINDIR) && cp -f scripts/xds-start-server.sh $(LOCAL_BINDIR)
+	@mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-start-server.sh scripts/agl $(LOCAL_BINDIR)
 
 .PHONY: install
 install: all scripts tools/syncthing
-	mkdir -p $(INSTALL_DIR) && cp $(LOCAL_BINDIR)/* $(INSTALL_DIR)
-	mkdir -p $(INSTALL_WEBAPP_DIR) && cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
+	mkdir -p $(INSTALL_DIR) \
+		&& cp $(LOCAL_BINDIR)/* $(INSTALL_DIR) \
+		&& cp $(LOCAL_TOOLSDIR)/syncthing* $(INSTALL_DIR)
+	mkdir -p $(INSTALL_WEBAPP_DIR) \
+		&& cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
 
 vendor: tools/glide glide.yaml
-	./tools/glide install --strip-vendor
+	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 tools/glide:
 	@echo "Downloading glide"
-	mkdir -p tools
-	curl --silent -L https://glide.sh/get | GOBIN=./tools  sh
+	mkdir -p $(LOCAL_TOOLSDIR)
+	curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh
 
 .PHONY: tools/syncthing
 tools/syncthing:
-	@(test -s $(LOCAL_BINDIR)/syncthing || \
-	DESTDIR=$(LOCAL_BINDIR) \
+	@(test -s $(LOCAL_TOOLSDIR)/syncthing || \
+	DESTDIR=$(LOCAL_TOOLSDIR) \
 	SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
 	SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
 	./scripts/get-syncthing.sh)