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
Fix glide path
[src/xds/xds-agent.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
902a238
..
1d1e07d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,13
+1,11
@@
# Makefile used to build XDS daemon Web Server
# Application Version
# Makefile used to build XDS daemon Web Server
# Application Version
-VERSION := 0.
0.1
+VERSION := 0.
1.0
# Syncthing version to install
SYNCTHING_VERSION = 0.14.28
# Syncthing version to install
SYNCTHING_VERSION = 0.14.28
-# FIXME: use patched version while waiting integration of #165
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION = master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
@@
-73,9
+71,9
@@
else
endif
endif
-all: tools/syncthing build
+all: tools/syncthing
vendor
build
-build:
vendor
tools/syncthing/copytobin
+build: tools/syncthing/copytobin
@echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
@echo "### Build XDS agent (version $(VERSION), subversion $(SUB_VERSION)) - $(BUILD_MODE)";
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-agent$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
@@
-95,13
+93,13
@@
package-all:
GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
test: tools/glide
GOOS=darwin GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
test: tools/glide
- go test --race $(shell ./tools/glide novendor)
+ go test --race $(shell ./tools/
linux/
glide novendor)
vet: tools/glide
vet: tools/glide
- go vet $(shell ./tools/glide novendor)
+ go vet $(shell ./tools/
linux/
glide novendor)
fmt: tools/glide
fmt: tools/glide
- go fmt $(shell ./tools/glide novendor)
+ go fmt $(shell ./tools/
linux/
glide novendor)
run: build/xds tools/syncthing/copytobin
$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
run: build/xds tools/syncthing/copytobin
$(LOCAL_BINDIR)/xds-agent$(EXT) --log info -c agent-config.json.in
@@
-122,12
+120,15
@@
install: all
mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
vendor: tools/glide glide.yaml
mkdir -p $(DESTDIR) && cp $(LOCAL_BINDIR)/* $(DESTDIR)
vendor: tools/glide glide.yaml
- ./tools/glide install --strip-vendor
+ ./tools/
linux/
glide install --strip-vendor
+.PHONY: tools/glide
tools/glide:
tools/glide:
- @echo "Downloading glide"
- mkdir -p tools
- curl --silent -L https://glide.sh/get | GOBIN=./tools sh
+ @test -f $(LOCAL_TOOLSDIR)/glide || { \
+ echo "Downloading glide"; \
+ mkdir -p $(LOCAL_TOOLSDIR); \
+ curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \
+ }
.PHONY: tools/syncthing
tools/syncthing:
.PHONY: tools/syncthing
tools/syncthing:
@@
-147,7
+148,8
@@
tools/syncthing/copytobin:
.PHONY: help
help:
@echo "Main supported rules:"
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " build (default)"
+ @echo " all (default)"
+ @echo " build
@echo " package"
@echo " install"
@echo " clean"
@echo " package"
@echo " install"
@echo " clean"