X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=ca04632b009a091738c5b2e54ea35b1b419e48c0;hb=840bfc5fd01bf036344bd687d2e40e0fc19f39e4;hp=fc6a603bc0b36f6759d2faba1c88bce8f275587f;hpb=b300a0413e9658aa2d9ebe0d4cddadc51881112a;p=src%2Fxds%2Fxds-agent.git

diff --git a/Makefile b/Makefile
index fc6a603..ca04632 100644
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,19 @@ SYNCTHING_INOTIFY_VERSION = master
 
 # Retrieve git tag/commit to set sub-version string
 ifeq ($(origin SUB_VERSION), undefined)
-	SUB_VERSION := $(shell git describe --tags --always | sed 's/^v//')
-	ifeq ($(SUB_VERSION), )
-		SUB_VERSION=unknown-dev
+	SUB_VERSION := $(shell git describe --tags 2>/dev/null | sed 's/^v//')
+	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//')
+		ifeq ($(SUB_VERSION), )
+			SUB_VERSION := unknown-dev
+		endif
 	endif
 endif
 
+
 # Configurable variables for installation (default /usr/local/...)
 ifeq ($(origin INSTALL_DIR), undefined)
 	INSTALL_DIR := /usr/local/bin
@@ -38,7 +45,7 @@ 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
+LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
 
 export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
@@ -57,17 +64,33 @@ else
 	BUILD_MODE="Release mode"
 endif
 
+ifeq ($(SUB_VERSION), )
+	PACKAGE_ZIPFILE := xds-agent_$(ARCH)-v$(VERSION).zip
+else
+	PACKAGE_ZIPFILE := xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip
+endif
+
+
 all: tools/syncthing build
 
 build: vendor 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 build
+package: clean tools/syncthing 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
-	cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/xds-agent_$(ARCH)-v$(VERSION)_$(SUB_VERSION).zip ./xds-agent
+	cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-agent
+
+.PHONY: package-all
+package-all:
+	@echo "# Build linux amd64..."
+	GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+	@echo "# Build windows amd64..."
+	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
 
 test: tools/glide
 	go test --race $(shell ./tools/glide novendor)