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

diff --git a/Makefile b/Makefile
index 5fb3204..b077bc7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,19 @@
 # Makefile used to build XDS daemon Web Server
 
+# Application Version
+VERSION := 0.0.1
+
+# Syncthing version to install
+SYNCTHING_VERSION = 0.14.27
+# FIXME: use patched version while waiting integration of #165
+#SYNCTHING_INOTIFY_VERSION = 0.8.5
+
+
 # Retrieve git tag/commit to set sub-version string
-ifeq ($(origin VERSION), undefined)
-	VERSION := $(shell git describe --tags --always | sed 's/^v//')
-	ifeq ($(VERSION), )
-		VERSION=unknown-dev
+ifeq ($(origin SUB_VERSION), undefined)
+	SUB_VERSION := $(shell git describe --tags --always | sed 's/^v//')
+	ifeq ($(SUB_VERSION), )
+		SUB_VERSION=unknown-dev
 	endif
 endif
 
@@ -13,7 +22,7 @@ ifeq ($(origin INSTALL_DIR), undefined)
 	INSTALL_DIR := /usr/local/bin
 endif
 ifeq ($(origin INSTALL_WEBAPP_DIR), undefined)
-	INSTALL_WEBAPP_DIR := ${INSTALL_DIR}/xds-server-www
+	INSTALL_WEBAPP_DIR := $(INSTALL_DIR)/xds-server-www
 endif
 
 HOST_GOOS=$(shell go env GOOS)
@@ -23,55 +32,48 @@ REPOPATH=github.com/iotbzh/xds-server
 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
 
-#WHAT := xds-make
 
 all: build webapp
 
-#build: build/xds build/cmds
-build: build/xds
-
-xds: build/xds
+.PHONY: build
+build: xds
 
-build/xds: vendor
-	@echo "### Build XDS server (version $(VERSION))";
-	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" .
-
-#build/cmds: vendor
-#	@for target in $(WHAT); do \
-#		echo "### Build $$target"; \
-#		$(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/$$target -ldflags "-X main.AppVersionGitTag=$(VERSION)" ./cmd/$$target; \
-#	done
+xds:vendor scripts
+	@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 -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
-	./bin/xds-server --log info -c config.json.in
+run: build/xds tools/syncthing
+	$(LOCAL_BINDIR)/xds-server --log info -c config.json.in
 
-debug: build/xds webapp/debug
-	./bin/xds-server --log debug -c config.json.in
+debug: build/xds webapp/debug tools/syncthing
+	$(LOCAL_BINDIR)/xds-server --log debug -c config.json.in
 
+.PHONY: clean
 clean:
-	rm -rf ./bin/* debug cmd/*/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
+	rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
 
+.PHONY: distclean
 distclean: clean
-	rm -rf bin tools glide.lock vendor cmd/*/vendor webapp/node_modules webapp/dist
-
-run3:
-	goreman start
+	rm -rf $(LOCAL_BINDIR) $(LOCAL_TOOLSDIR) glide.lock vendor webapp/node_modules webapp/dist
 
 webapp: webapp/install
 	(cd webapp && gulp build)
@@ -82,32 +84,43 @@ webapp/debug:
 webapp/install:
 	(cd webapp && npm install)
 
+.PHONY: scripts
+scripts:
+	@mkdir -p $(LOCAL_BINDIR) && cp -rf scripts/xds-start-server.sh scripts/agl $(LOCAL_BINDIR)
 
-install: all
-	mkdir -p ${INSTALL_DIR} && cp bin/xds-server ${INSTALL_DIR}
-	mkdir -p ${INSTALL_WEBAPP_DIR} && cp -a webapp/dist/* ${INSTALL_WEBAPP_DIR}
+.PHONY: install
+install: all scripts tools/syncthing
+	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
-
-goenv:
-	@go env
-
+	mkdir -p $(LOCAL_TOOLSDIR)
+	curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh
+
+.PHONY: tools/syncthing
+tools/syncthing:
+	@(test -s $(LOCAL_TOOLSDIR)/syncthing || \
+	DESTDIR=$(LOCAL_TOOLSDIR) \
+	SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
+	SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
+	./scripts/get-syncthing.sh)
+
+.PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  build               (default)"
-	@echo "  build/xds"
-	@echo "  build/cmds"
-	@echo "  release"
+	@echo "  all                (default)"
+	@echo "  build"
+	@echo "  install"
 	@echo "  clean"
 	@echo "  distclean"
 	@echo ""
 	@echo "Influential make variables:"
 	@echo "  V                 - Build verbosity {0,1,2}."
 	@echo "  BUILD_ENV_FLAGS   - Environment added to 'go build'."
-#	@echo "  WHAT              - Command to build. (e.g. WHAT=xds-make)"