Use go module as dependency tool instead of glidehalibut_7.99.3halibut_7.99.2halibut_7.99.1halibut/7.99.3halibut/7.99.2halibut/7.99.17.99.37.99.27.99.1

Bug-AGL: SPEC-2289

Change-Id: I0218ccd23ef9340c3d80ed0e1c5f04e651220813
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

1 files changed, 34 insertions, 23 deletions

diff --git a/Makefile b/Makefile
index cebe28e..5316993 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>
 #
@@ -54,16 +54,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=.
 
-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
@@ -91,30 +93,35 @@ endif
 PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
 .PHONY: all
-all: vendor build
+all: gomod build
 
 .PHONY: build
 build: checkgover
 	@echo "### Build $(TARGET) (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 test --race . -v
 
-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)
 
 .PHONY: clean
 clean:
-	rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
+	rm -rf $(LOCAL_BINDIR)/* $(ROOT_SRCDIR)/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR)
 
 .PHONY: distclean
 distclean: clean
-	rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip)
+	(cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip)
+	 go clean -modcache
 
+.PHONY: clean-lock
+clean-lock: distclean
+	(cd $(ROOT_SRCDIR) && rm -f ./go.sum)
 
 .PHONY: scripts
 scripts:
@@ -151,26 +158,30 @@ install:
 uninstall:
 	export DESTDIR=$(DESTDIR) && $(ROOT_SRCDIR)/scripts/install.sh uninstall
 
-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-agent.git => $(ROOT_SRCDIR)/../xds-agent" >> $(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-agent.git && ln -s ../../../../../../xds-agent xds-agent.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:
 checkgover:
 	@test "$(CHECKGOVER)" = "true" || { echo -e $(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: