Fixed syncthing binDir when set to '.'

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

diff --git a/Makefile b/Makefile
index ad017eb..56082fd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,9 @@ ifeq ($(origin SUB_VERSION), undefined)
        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//')
+       endif
+       ifeq ($(SUB_VERSION), )
+               SUB_VERSION := $(shell git rev-parse --short HEAD)
                ifeq ($(SUB_VERSION), )
                        SUB_VERSION := unknown-dev
                endif
@@ -77,7 +78,7 @@ build: 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 tools/syncthing build
+package: clean tools/syncthing vendor 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
@@ -91,6 +92,7 @@ package-all:
        GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
        @echo "# Build darwin amd64..."
        GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+       make -f $(ROOT_SRCDIR)/Makefile clean
 
 test: tools/glide
        go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
@@ -149,7 +151,7 @@ tools/syncthing/copytobin:
 help:
        @echo "Main supported rules:"
        @echo "  all               (default)"
-       @echo "  build
+       @echo "  build"
        @echo "  package"
        @echo "  install"
        @echo "  clean"