X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=6396405a3ea5e9db1373e5a677e1951b7290883b;hb=add6f928e6a95d14b511ebd59e0fba231747cdbb;hp=99fbb555d5329c6afcae9c265291ca50de81adf5;hpb=b7bc9102de461eb880d951f16bdd9ded74e43a4f;p=src%2Fxds%2Fxds-server.git

diff --git a/Makefile b/Makefile
index 99fbb55..6396405 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ SYNCTHING_INOTIFY_VERSION = 0.8.7
 
 
 # Retrieve git tag/commit to set version & sub-version strings
-GIT_DESC := $(shell git describe --always --tags)
+GIT_DESC := $(shell git describe --always --tags --match "[0-9]*")
 VERSION := $(firstword $(subst -, ,$(GIT_DESC)))
 ifeq (-,$(findstring -,$(GIT_DESC)))
 	SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
@@ -78,8 +78,8 @@ export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1)
 GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.)
 GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.)
-CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true)
-CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))."
+CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 9 \) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.9.0 or higher is requested (current detected version: $(GOVERSION))."
 
 
 VERBOSE_1 := -v
@@ -100,16 +100,15 @@ else
 	WEBAPP_BUILD_RULE=build:prod
 endif
 
-ifeq ($(SUB_VERSION), )
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).zip
+# Build Package name (model: <target>_<arch>-<version>.<nb_commit_from_last_tag>.zip)
+ifeq (-g,$(findstring -g,$(GIT_DESC)))
+	NB_COMMIT=$(firstword $(subst -, ,$(SUB_VERSION)))
 else
-	# only use dot as separator to allow rpm packaging (see version .spec file)
-	PK_VER := $(subst _,.,$(subst -,,$(VERSION)))
-	PK_SBVER := $(subst _,.,$(subst -,,$(SUB_VERSION)))
-	PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(PK_VER).$(PK_SBVER).zip
+	NB_COMMIT=0
 endif
+PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
-
+.PHONY: all
 all: tools/syncthing build
 
 .PHONY: build
@@ -119,8 +118,13 @@ xds: scripts tools/syncthing/copytobin
 	@echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
 	@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" .
 
-test: tools/glide
-	go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+.PHONY: test
+test: checkgorace tools/glide
+ifndef name
+	GOCACHE=off go test --race ./test -v
+else
+	GOCACHE=off go test --race ./test -v -run $(name)
+endif
 
 vet: tools/glide
 	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
@@ -140,7 +144,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	(cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+	(cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules ./scripts/sdks/agl/sdks_*.json)
 
 webapp: webapp/install
 	mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts
@@ -149,7 +153,7 @@ webapp: webapp/install
 
 webapp/install:
 	(cd webapp && npm install)
-	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; }
+	@[ -d ${DESTDIR}/usr ] && { echo "Removing unwanted ${DESTDIR}/usr directory"; rm -rf ${DESTDIR}/usr; } || true
 
 .PHONY: scripts
 scripts:
@@ -223,12 +227,16 @@ tools/syncthing/copytobin:
 checkgover:
 	@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
 
+.PHONY:
+checkgorace: checkgover
+	@ls $(shell go env GOROOT)/src/runtime/race/*.syso 1> /dev/null 2>&1 || { echo "ERROR: go-race package mandatory to run test. Please install it, for example: zypper install go-race"; exit 1; }
 
 .PHONY: help
 help:
 	@echo "Main supported rules:"
-	@echo "  all                (default)"
+	@echo "  all         (default)"
 	@echo "  build"
+	@echo "  test        (use: name=TestExec to run a specific test)"
 	@echo "  package"
 	@echo "  install"
 	@echo "  clean"