X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-agent.git;a=blobdiff_plain;f=Makefile;h=273458f20d0944facd8e7869516f8938bdc19c2a;hp=cde26981e9f9e9ec36b5ef7d8859f83c4cc18f2d;hb=247bb7c2db5f0d48178398599348249bf886ebbc;hpb=2d3f1be6a495143d7e82f6396a49dfff6cabc3e4

diff --git a/Makefile b/Makefile
index cde2698..273458f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
  ###########################################################################
-# Copyright 2017-2018 IoT.bzh
+# Copyright 2017-2019 IoT.bzh
 #
 # author: Sebastien Douheret <sebastien@iot.bzh>
 #
@@ -62,16 +62,18 @@ ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..)
 LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
 LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
+PACKAGE_LIST=./lib/... .
 
-export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
+export GO111MODULE=on
+export GOPATH := $(ROOT_GOPRJ):$(shell go env GOPATH)
 export PATH := $(PATH):$(LOCAL_TOOLSDIR)
 
 # Check Go version
 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 12 \) ] && echo true)
+CHECKERRMSG := "ERROR: Go version 1.12 or higher is requested (current detected version: $(GOVERSION))."
 
 
 VERBOSE_1 := -v
@@ -100,24 +102,26 @@ else
 endif
 PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
-
+.PHONY: all
 all: tools/syncthing build
 
 .PHONY: build
-build: checkgover vendor xds webapp
+build: checkgover gomod xds webapp
 
 xds: scripts 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)/$(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
+	go clean -testcache
+	go test --race $(PACKAGE_LIST)
 
-vet: tools/glide
-	go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+vet:
+	go vet $(PACKAGE_LIST)
 
-fmt: tools/glide
-	go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
+fmt:
+	go fmt $(PACKAGE_LIST)
 
 run: build/xds tools/syncthing/copytobin
 	$(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS)
@@ -131,7 +135,12 @@ 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 ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+	 go clean -modcache
+
+.PHONY: clean-lock
+clean-lock: distclean
+	(cd $(ROOT_SRCDIR) && rm -f ./go.sum ./webapp/package-lock.json)
 
 webapp: webapp/install
 ifneq ($(SKIP_WEBAPP_BUILD), true)
@@ -182,22 +191,23 @@ package-all:
 	GOOS=darwin GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package
 	make -f $(ROOT_SRCDIR)/Makefile clean
 
-vendor: tools/glide glide.yaml
-	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
+.PHONY: gomod
+gomod:
+	go get
+
+gomod/debug:
+	@echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git => $(ROOT_SRCDIR)/../xds-common" >> $(ROOT_SRCDIR)/go.mod
+	@echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git => $(ROOT_SRCDIR)/../xds-server" >> $(ROOT_SRCDIR)/go.mod
+	@echo "Add replace in go.mod file - done."
+
+vendor: gomod
+	go mod vendor
 
 vendor/debug: vendor
 	(cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \
 		rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \
 		rm -rf xds-server.git && ln -s ../../../../../../xds-server xds-server.git )
 
-.PHONY: tools/glide
-tools/glide:
-	@test -f $(LOCAL_TOOLSDIR)/glide || { \
-		echo "Downloading glide"; \
-		mkdir -p $(LOCAL_TOOLSDIR); \
-		curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR)  sh; \
-	}
-
 .PHONY: tools/syncthing
 tools/syncthing:
 	@test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT)  || { \
@@ -217,6 +227,9 @@ 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: