Use patched version of syncthing-inotify.

[src/xds/xds-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 6f9f990..247d454 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,19 @@
 # Makefile used to build XDS daemon Web Server
 
+# Application Version
+VERSION := 0.0.1
+
 # Syncthing version to install
-SYNCTHING_VERSION = 0.14.25
-SYNCTHING_INOTIFY_VERSION = 0.8.5
+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
 
@@ -38,13 +43,12 @@ VERBOSE_2 := -v -x
 
 all: build webapp
 
-build: build/xds
+.PHONY: build
+build: xds
 
-xds: build/xds
-
-build/xds: vendor scripts
-       @echo "### Build XDS server (version $(VERSION))";
-       @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" .
+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)
@@ -63,14 +67,11 @@ debug: build/xds webapp/debug tools/syncthing
 
 .PHONY: clean
 clean:
-       rm -rf $(LOCAL_BINDIR)/* debug cmd/*/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
+       rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
 
 .PHONY: distclean
 distclean: clean
-       rm -rf $(LOCAL_BINDIR) tools glide.lock vendor cmd/*/vendor webapp/node_modules webapp/dist
-
-run3:
-       goreman start
+       rm -rf $(LOCAL_BINDIR) tools glide.lock vendor webapp/node_modules webapp/dist
 
 webapp: webapp/install
        (cd webapp && gulp build)
@@ -109,9 +110,9 @@ tools/syncthing:
 .PHONY: help
 help:
        @echo "Main supported rules:"
-       @echo "  build               (default)"
-       @echo "  build/xds"
-       @echo "  release"
+       @echo "  all                (default)"
+       @echo "  build"
+       @echo "  install"
        @echo "  clean"
        @echo "  distclean"
        @echo ""