X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=0f19a24a12fc907973bb2ffdef7ab9222a267d9b;hb=3a51ad34bfe80aad964ab8da08a6c1eb742b9040;hp=44e3d0a01e7c411587acb1a2e3ab2eec58ab65f2;hpb=fa388b959a98d8e60c9e591d50a3862cb77b0457;p=src%2Fxds%2Fxds-agent.git diff --git a/Makefile b/Makefile index 44e3d0a..0f19a24 100644 --- a/Makefile +++ b/Makefile @@ -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)" @@ -177,7 +177,7 @@ vendor: tools/glide glide.yaml vendor/debug: vendor (cd vendor/github.com/iotbzh && \ - rm -rf xds-common && ln -s ../../../../xds-common \ + rm -rf xds-common && ln -s ../../../../xds-common && \ rm -rf xds-server && ln -s ../../../../xds-server ) .PHONY: tools/glide