X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=Makefile;h=f448d7221e059912b4f7d989ef55e077803ac0cf;hb=32791ffed5bdfaa698e90f9c067dc6e8ababbfc3;hp=51e17952643ba7310e1e49a1eb337a79c5db4391;hpb=4afc24d8b2894ca49035a4d5fa04ab2c91dc0ede;p=src%2Fxds%2Fxds-agent.git diff --git a/Makefile b/Makefile index 51e1795..f448d72 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,9 @@ SUB_VERSION := $(subst $(VERSION)-,,$(GIT_DESC)) 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) @@ -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 webapp && gulp build) + (cd webapp && npm run build) webapp/debug: - (cd webapp && gulp watch &) + (cd webapp && npm run watch) webapp/install: (cd webapp && npm install) @@ -137,7 +140,8 @@ vendor: tools/glide glide.yaml 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: