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
Add IoT logo and change top bar color.
[src/xds/xds-server.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
adc2995
..
d839539
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,35
+1,41
@@
# 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 master while waiting a release that include #164
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION=master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
# Retrieve git tag/commit to set sub-version string
ifeq ($(origin SUB_VERSION), undefined)
# Retrieve git tag/commit to set sub-version string
ifeq ($(origin SUB_VERSION), undefined)
- SUB_VERSION := $(shell git describe --tags 2>/dev/null | sed 's/^v//')
+ SUB_VERSION := $(shell git describe --
exact-match --
tags 2>/dev/null | sed 's/^v//')
ifneq ($(SUB_VERSION), )
VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
else
ifneq ($(SUB_VERSION), )
VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
else
- SUB_VERSION := $(shell git
describe --tags --always | sed 's/^v//'
)
+ SUB_VERSION := $(shell git
rev-parse --short HEAD
)
ifeq ($(SUB_VERSION), )
SUB_VERSION := unknown-dev
endif
endif
endif
ifeq ($(SUB_VERSION), )
SUB_VERSION := unknown-dev
endif
endif
endif
+# for backward compatibility
+ifneq ($(origin INSTALL_DIR), undefined)
+ DESTDIR := $(INSTALL_DIR)
+endif
+ifneq ($(origin INSTALL_WEBAPP_DIR), undefined)
+ DESTDIR_WWW := $(INSTALL_WEBAPP_DIR)
+endif
+
# Configurable variables for installation (default /usr/local/...)
# Configurable variables for installation (default /usr/local/...)
-ifeq ($(origin
INSTALL_
DIR), undefined)
-
INSTALL_
DIR := /usr/local/bin
+ifeq ($(origin
DEST
DIR), undefined)
+
DEST
DIR := /usr/local/bin
endif
endif
-ifeq ($(origin
INSTALL_WEBAPP_DIR
), undefined)
-
INSTALL_WEBAPP_DIR := $(INSTALL_
DIR)/www-xds-server
+ifeq ($(origin
DESTDIR_WWW
), undefined)
+
DESTDIR_WWW := $(DEST
DIR)/www-xds-server
endif
HOST_GOOS=$(shell go env GOOS)
endif
HOST_GOOS=$(shell go env GOOS)
@@
-46,10
+52,9
@@
mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path)))
ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..)
LOCAL_BINDIR := $(ROOT_SRCDIR)/bin
-LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools
+LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools
/${HOST_GOOS}
PACKAGE_DIR := $(ROOT_SRCDIR)/package
PACKAGE_DIR := $(ROOT_SRCDIR)/package
-
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ)
export PATH := $(PATH):$(LOCAL_TOOLSDIR)
@@
-76,10
+81,10
@@
endif
all: tools/syncthing build
.PHONY: build
all: tools/syncthing build
.PHONY: build
-build: xds webapp
+build:
vendor
xds webapp
-xds:
vendor
scripts tools/syncthing/copytobin
- @echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))";
+xds: scripts tools/syncthing/copytobin
+ @echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION)
, $(BUILD_MODE)
)";
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
test: tools/glide
@cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
test: tools/glide
@@
-103,7
+108,7
@@
clean:
.PHONY: distclean
distclean: clean
.PHONY: distclean
distclean: clean
- rm -rf $(LOCAL_BINDIR) $(
LOCAL_TOOLSDIR)
glide.lock vendor webapp/node_modules webapp/dist
+ rm -rf $(LOCAL_BINDIR) $(
ROOT_SRCDIR)/tools
glide.lock vendor webapp/node_modules webapp/dist
webapp: webapp/install
(cd webapp && gulp build)
webapp: webapp/install
(cd webapp && gulp build)
@@
-113,6
+118,7
@@
webapp/debug:
webapp/install:
(cd webapp && npm install)
webapp/install:
(cd webapp && npm install)
+ @if [ -d ${DESTDIR}/usr/local/etc ]; then rm -rf ${DESTDIR}/usr; fi
.PHONY: scripts
scripts:
.PHONY: scripts
scripts:
@@
-121,24
+127,24
@@
scripts:
.PHONY: conffile
conffile:
cat config.json.in \
.PHONY: conffile
conffile:
cat config.json.in \
- | sed -e s,"webapp/dist","$(
INSTALL_WEBAPP_DIR
)",g \
+ | sed -e s,"webapp/dist","$(
DESTDIR_WWW
)",g \
| sed -e s,"\./bin","",g \
| sed -e s,"\./bin","",g \
- > $(
PACKAGE_DIR)/xds-server
/config.json
+ > $(
DESTDIR)
/config.json
.PHONY: install
install:
@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/xds-server-start.sh -a -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
.PHONY: install
install:
@test -e $(LOCAL_BINDIR)/xds-server$(EXT) -a -d webapp/dist || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/xds-server-start.sh -a -d $(LOCAL_BINDIR)/xds-utils || { echo "Please execute first: make all\n"; exit 1; }
@test -e $(LOCAL_BINDIR)/syncthing$(EXT) -a -e $(LOCAL_BINDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make all\n"; exit 1; }
- mkdir -p $(
INSTALL_
DIR) \
- && cp -a $(LOCAL_BINDIR)/* $(
INSTALL_
DIR)
- mkdir -p $(
INSTALL_WEBAPP_DIR
) \
- && cp -a webapp/dist/* $(
INSTALL_WEBAPP_DIR
)
+ mkdir -p $(
DEST
DIR) \
+ && cp -a $(LOCAL_BINDIR)/* $(
DEST
DIR)
+ mkdir -p $(
DESTDIR_WWW
) \
+ && cp -a webapp/dist/* $(
DESTDIR_WWW
)
.PHONY: package
package: clean
.PHONY: package
package: clean
- INSTALL_DIR=$(PACKAGE_DIR)/xds-server make -f $(ROOT_SRCDIR)/Makefile all install
- INSTALL_DIR=$(PACKAGE_DIR)/xds-server INSTALL_WEBAPP_DIR=www-xds-server make -f $(ROOT_SRCDIR)/Makefile conffile
+ make -f $(ROOT_SRCDIR)/Makefile all install DESTDIR=$(PACKAGE_DIR)/xds-server
+ make -f $(ROOT_SRCDIR)/Makefile conffile DESTDIR=$(PACKAGE_DIR)/xds-server DESTDIR_WWW=www-xds-server
(cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server)
.PHONY: package-all
(cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server)
.PHONY: package-all
@@
-151,10
+157,17
@@
package-all:
vendor: tools/glide glide.yaml
$(LOCAL_TOOLSDIR)/glide install --strip-vendor
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 )
+
+.PHONY: tools/glide
tools/glide:
tools/glide:
- @echo "Downloading glide"
- mkdir -p $(LOCAL_TOOLSDIR)
- curl --silent -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) 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: