Code Review
/
src
/
xds
/
xds-agent.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed Xds-server re-connection.
[src/xds/xds-agent.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
cd1cf05
..
0f19a24
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-118,10
+118,10
@@
fmt: tools/glide
go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor)
run: build/xds tools/syncthing/copytobin
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
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:
.PHONY: clean
clean:
@@
-155,7
+155,10
@@
package: clean tools/syncthing vendor build
@mkdir -p $(PACKAGE_DIR)/$(TARGET)/www $(PACKAGE_DIR)/scripts
@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/$(TARGET)/
@cp -a webapp/dist/* $(PACKAGE_DIR)/$(TARGET)/www/
@mkdir -p $(PACKAGE_DIR)/$(TARGET)/www $(PACKAGE_DIR)/scripts
@cp -a $(LOCAL_BINDIR)/* $(PACKAGE_DIR)/$(TARGET)/
@cp -a webapp/dist/* $(PACKAGE_DIR)/$(TARGET)/www/
- @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)/
+ifneq ($(GOOS), windows)
+ @cp -r $(ROOT_SRCDIR)/conf.d $(ROOT_SRCDIR)/scripts $(PACKAGE_DIR)/$(TARGET)/
+endif
+ @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)"
@cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./$(TARGET)
@echo "### Package $(PACKAGE_ZIPFILE) has been successfuly built - $(BUILD_MODE)"
@@
-174,7
+177,7
@@
vendor: tools/glide glide.yaml
vendor/debug: vendor
(cd vendor/github.com/iotbzh && \
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
rm -rf xds-server && ln -s ../../../../xds-server )
.PHONY: tools/glide