Update default syncthing port to 8386

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

diff --git a/Makefile b/Makefile
index f2f8dd1..ae5a69c 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
@@ -56,11 +57,14 @@ VERBOSE_2 := -v -x
 
 # Release or Debug mode
 ifeq ($(filter 1,$(RELEASE) $(REL)),)
-       GORELEASE=
+       GO_LDFLAGS=
+       # disable compiler optimizations and inlining
+       GO_GCFLAGS=-N -l
        BUILD_MODE="Debug mode"
 else
        # optimized code without debug info
-       GORELEASE= -s -w
+       GO_LDFLAGS=-s -w
+       GO_GCFLAGS=
        BUILD_MODE="Release mode"
 endif
 
@@ -75,9 +79,9 @@ all: tools/syncthing vendor build
 
 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)" .
+       @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)" -gcflags "$(GO_GCFLAGS)" .
 
-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,15 +95,16 @@ 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 ./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/copytobin
        $(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
@@ -120,7 +125,7 @@ install: all
        mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
 
 vendor: tools/glide glide.yaml
-       ./tools/glide install --strip-vendor
+       $(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 .PHONY: tools/glide
 tools/glide:
@@ -149,7 +154,7 @@ tools/syncthing/copytobin:
 help:
        @echo "Main supported rules:"
        @echo "  all               (default)"
-       @echo "  build
+       @echo "  build"
        @echo "  package"
        @echo "  install"
        @echo "  clean"