Fixed listed sdk in build panel (only installed sdks)

[src/xds/xds-agent.git] / Makefile

diff --git a/Makefile b/Makefile
index 44e3d0a..dd5294c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
  ###########################################################################
-# Copyright 2017 IoT.bzh
+# Copyright 2017-2018 IoT.bzh
 #
 # author: Sebastien Douheret <sebastien@iot.bzh>
 #
@@ -49,7 +49,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)
@@ -58,7 +58,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
@@ -118,10 +118,10 @@ fmt: tools/glide
        go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
 
 run: build/xds tools/syncthing/copytobin
-       $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info -c agent-config.json.in
+       $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS)
 
 debug: build/xds tools/syncthing/copytobin
-       $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug -c agent-config.json.in
+       $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log debug $(XDS_AGENT_DEBUG_ARGS)
 
 .PHONY: clean
 clean:
@@ -158,7 +158,7 @@ package: clean tools/syncthing vendor build
 ifneq ($(GOOS), windows)
                @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)/
 endif
-       @cp $(ROOT_SRCDIR)/conf.d/etc/xds-agent/config.json $(PACKAGE_DIR)/$(TARGET)/config.json.in
+       @cp $(ROOT_SRCDIR)/conf.d/etc/xds/agent/agent-config.json $(PACKAGE_DIR)/$(TARGET)/agent-config.json.in
        @cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET)
        @echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)"
 
@@ -176,9 +176,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-server && ln -s ../../../../xds-server )
+       (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: