X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=2d2586e23d12b54ece5a8029bf6ef3101d7667e7;hb=d65f2c73bfe6d302d5609e949e64254cf2713a1e;hp=991118d6896094bb70157d90dad91e14771ae97a;hpb=6f71a805b2f6f961761b5906a21d2a234b84aa4c;p=src%2Fxds%2Fxds-cli.git

diff --git a/Makefile b/Makefile
index 991118d..2d2586e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
  ###########################################################################
-# Copyright 2017 IoT.bzh
+# Copyright 2017-2018 IoT.bzh
 #
 # author: Sebastien Douheret <sebastien@iot.bzh>
 #
@@ -42,7 +42,7 @@ endif
 HOST_GOOS=$(shell go env GOOS)
 HOST_GOARCH=$(shell go env GOARCH)
 ARCH=$(HOST_GOOS)-$(HOST_GOARCH)
-REPOPATH=github.com/iotbzh/$(TARGET)
+REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET)
 
 EXT=
 ifeq ($(HOST_GOOS), windows)
@@ -51,7 +51,7 @@ endif
 
 mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
 ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
-ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
+ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..)
 LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
 LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS}
 PACKAGE_DIR := $(ROOT_SRCDIR)/package
@@ -63,8 +63,9 @@ 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)). \n\
+\t--> It may be necessary to clear glide cache with following command 'tools/linux/glide cc'"
 
 
 VERBOSE_1 := -v
@@ -155,9 +156,9 @@ vendor: tools/glide glide.yaml
 	$(LOCAL_TOOLSDIR)/glide install --strip-vendor
 
 vendor/debug: vendor
-	(cd vendor/github.com/iotbzh && \
-		rm -rf xds-common && ln -s ../../../../xds-common && \
-		rm -rf xds-agent && ln -s ../../../../xds-agent )
+	(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:
@@ -169,7 +170,7 @@ tools/glide:
 
 .PHONY:
 checkgover:
-	@test "$(CHECKGOVER)" = "true" || { echo $(CHECKERRMSG); exit 1; }
+	@test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; }
 
 
 .PHONY: help