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 connection config - dashboard
[src/xds/xds-agent.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
51e1795
..
f448d72
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-12,6
+12,9
@@
SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC))
ifeq ($(VERSION), )
VERSION := unknown-dev
endif
ifeq ($(VERSION), )
VERSION := unknown-dev
endif
+ifeq ($(SUB_VERSION), )
+ SUB_VERSION := $(shell date +'%Y-%m-%d_%H%M%S')
+endif
# Configurable variables for installation (default /opt/AGL/...)
ifeq ($(origin DESTDIR), undefined)
# Configurable variables for installation (default /opt/AGL/...)
ifeq ($(origin DESTDIR), undefined)
@@
-97,10
+100,10
@@
distclean: clean
cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
webapp: webapp/install
cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/node_modules ./webapp/dist
webapp: webapp/install
- (cd webapp &&
gulp
build)
+ (cd webapp &&
npm run
build)
webapp/debug:
webapp/debug:
- (cd webapp &&
gulp watch &
)
+ (cd webapp &&
npm run watch
)
webapp/install:
(cd webapp && npm install)
webapp/install:
(cd webapp && npm install)
@@
-137,7
+140,8
@@
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
tools/glide:
.PHONY: tools/glide
tools/glide: