X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=56082fda88ab50c4701f9baa2a47d1819dabdf4d;hb=09763a60f600342b8ecb997a83d80110f341048d;hp=1d1e07d98f51fb66c5fc29b28ec27388760adbb9;hpb=228292f1a8b2758cca63c934fdb0762377e5b31a;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index 1d1e07d..56082fd 100644
--- 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,15 +92,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/linux/glide novendor)
+	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 vet: tools/glide
-	go vet $(shell ./tools/linux/glide novendor)
+	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 fmt: tools/glide
-	go fmt $(shell ./tools/linux/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 +122,7 @@ install: all
 	mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
 
 vendor: tools/glide glide.yaml
-	./tools/linux/glide install --strip-vendor
+	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 .PHONY: tools/glide
 tools/glide:
@@ -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"