Code Review
/
src
/
xds
/
xds-server.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Cleanup
[src/xds/xds-server.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
5fb3204
..
210b44b
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,5
+1,9
@@
# Makefile used to build XDS daemon Web Server
# Makefile used to build XDS daemon Web Server
+# Syncthing version to install
+SYNCTHING_VERSION = 0.14.25
+SYNCTHING_INOTIFY_VERSION = 0.8.5
+
# Retrieve git tag/commit to set sub-version string
ifeq ($(origin VERSION), undefined)
VERSION := $(shell git describe --tags --always | sed 's/^v//')
# Retrieve git tag/commit to set sub-version string
ifeq ($(origin VERSION), undefined)
VERSION := $(shell git describe --tags --always | sed 's/^v//')
@@
-13,7
+17,7
@@
ifeq ($(origin INSTALL_DIR), undefined)
INSTALL_DIR := /usr/local/bin
endif
ifeq ($(origin INSTALL_WEBAPP_DIR), undefined)
INSTALL_DIR := /usr/local/bin
endif
ifeq ($(origin INSTALL_WEBAPP_DIR), undefined)
- INSTALL_WEBAPP_DIR := $
{INSTALL_DIR}
/xds-server-www
+ INSTALL_WEBAPP_DIR := $
(INSTALL_DIR)
/xds-server-www
endif
HOST_GOOS=$(shell go env GOOS)
endif
HOST_GOOS=$(shell go env GOOS)
@@
-23,6
+27,7
@@
REPOPATH=github.com/iotbzh/xds-server
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
+LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(ROOT_SRCDIR)/tools
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(ROOT_SRCDIR)/tools
@@
-30,24
+35,15
@@
export PATH := $(PATH):$(ROOT_SRCDIR)/tools
VERBOSE_1 := -v
VERBOSE_2 := -v -x
VERBOSE_1 := -v
VERBOSE_2 := -v -x
-#WHAT := xds-make
all: build webapp
all: build webapp
-#build: build/xds build/cmds
-build: build/xds
-
-xds: build/xds
+.PHONY: build
+build: xds
-build/xds: vendor
+xds:vendor scripts
@echo "### Build XDS server (version $(VERSION))";
@echo "### Build XDS server (version $(VERSION))";
- @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" .
-
-#build/cmds: vendor
-# @for target in $(WHAT); do \
-# echo "### Build $$target"; \
-# $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o bin/$$target -ldflags "-X main.AppVersionGitTag=$(VERSION)" ./cmd/$$target; \
-# done
+ @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server -ldflags "-X main.AppVersionGitTag=$(VERSION)" .
test: tools/glide
go test --race $(shell ./tools/glide novendor)
test: tools/glide
go test --race $(shell ./tools/glide novendor)
@@
-58,20
+54,19
@@
vet: tools/glide
fmt: tools/glide
go fmt $(shell ./tools/glide novendor)
fmt: tools/glide
go fmt $(shell ./tools/glide novendor)
-run: build/xds
-
./bin
/xds-server --log info -c config.json.in
+run: build/xds
tools/syncthing
+
$(LOCAL_BINDIR)
/xds-server --log info -c config.json.in
-debug: build/xds webapp/debug
-
./bin
/xds-server --log debug -c config.json.in
+debug: build/xds webapp/debug
tools/syncthing
+
$(LOCAL_BINDIR)
/xds-server --log debug -c config.json.in
+.PHONY: clean
clean:
clean:
- rm -rf
./bin/* debug cmd/*/
debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
+ rm -rf
$(LOCAL_BINDIR)/*
debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH)
+.PHONY: distclean
distclean: clean
distclean: clean
- rm -rf bin tools glide.lock vendor cmd/*/vendor webapp/node_modules webapp/dist
-
-run3:
- goreman start
+ rm -rf $(LOCAL_BINDIR) tools glide.lock vendor webapp/node_modules webapp/dist
webapp: webapp/install
(cd webapp && gulp build)
webapp: webapp/install
(cd webapp && gulp build)
@@
-82,10
+77,14
@@
webapp/debug:
webapp/install:
(cd webapp && npm install)
webapp/install:
(cd webapp && npm install)
+.PHONY: scripts
+scripts:
+ @mkdir -p $(LOCAL_BINDIR) && cp -f scripts/xds-start-server.sh $(LOCAL_BINDIR)
-install: all
- mkdir -p ${INSTALL_DIR} && cp bin/xds-server ${INSTALL_DIR}
- mkdir -p ${INSTALL_WEBAPP_DIR} && cp -a webapp/dist/* ${INSTALL_WEBAPP_DIR}
+.PHONY: install
+install: all scripts tools/syncthing
+ mkdir -p $(INSTALL_DIR) && cp $(LOCAL_BINDIR)/* $(INSTALL_DIR)
+ mkdir -p $(INSTALL_WEBAPP_DIR) && cp -a webapp/dist/* $(INSTALL_WEBAPP_DIR)
vendor: tools/glide glide.yaml
./tools/glide install --strip-vendor
vendor: tools/glide glide.yaml
./tools/glide install --strip-vendor
@@
-95,19
+94,22
@@
tools/glide:
mkdir -p tools
curl --silent -L https://glide.sh/get | GOBIN=./tools sh
mkdir -p tools
curl --silent -L https://glide.sh/get | GOBIN=./tools sh
-goenv:
- @go env
+.PHONY: tools/syncthing
+tools/syncthing:
+ @(test -s $(LOCAL_BINDIR)/syncthing || \
+ DESTDIR=$(LOCAL_BINDIR) \
+ SYNCTHING_VERSION=$(SYNCTHING_VERSION) \
+ SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
+ ./scripts/get-syncthing.sh)
+.PHONY: help
help:
@echo "Main supported rules:"
@echo " build (default)"
@echo " build/xds"
help:
@echo "Main supported rules:"
@echo " build (default)"
@echo " build/xds"
- @echo " build/cmds"
- @echo " release"
@echo " clean"
@echo " distclean"
@echo ""
@echo "Influential make variables:"
@echo " V - Build verbosity {0,1,2}."
@echo " BUILD_ENV_FLAGS - Environment added to 'go build'."
@echo " clean"
@echo " distclean"
@echo ""
@echo "Influential make variables:"
@echo " V - Build verbosity {0,1,2}."
@echo " BUILD_ENV_FLAGS - Environment added to 'go build'."
-# @echo " WHAT - Command to build. (e.g. WHAT=xds-make)"