X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=7c26883682a3da471bed85aa3d05c6d2885c4e19;hb=7d1bcb1c9a48514e0e26246b86c8597502833b4b;hp=819e4b4033a2d947cf943523f685c3fa3ec8b452;hpb=f95aa5f0e39b85198655e8399c161fc5e6cd8a59;p=src%2Fxds%2Fxds-cli.git diff --git a/Makefile b/Makefile index 819e4b4..7c26883 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # @@ -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 @@ -127,7 +127,9 @@ release: package: clean vendor build @mkdir -p $(PACKAGE_DIR)/$(TARGET) @cp -a $(LOCAL_BINDIR)/*cli$(EXT) $(PACKAGE_DIR)/$(TARGET) +ifneq ($(GOOS), windows) @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET) +endif cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET) .PHONY: package-all @@ -153,9 +155,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: