Mercurial > gemma
changeset 1008:9f49ae20c54c
demo build via make demo
| author | Markus Kottlaender <markus@intevation.de> |
|---|---|
| date | Tue, 23 Oct 2018 08:34:44 +0200 |
| parents | ea8db3ec863c |
| children | 76e9296d6191 |
| files | Makefile client/Makefile.build client/package.json |
| diffstat | 3 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Tue Oct 23 07:42:54 2018 +0200 +++ b/Makefile Tue Oct 23 08:34:44 2018 +0200 @@ -14,10 +14,12 @@ 3rdpartylibs-stamp := $(BUILDBASE)/3rdpartylibs-build -.PHONY: all 3rdpartylibs gemma client clean +.PHONY: all demo 3rdpartylibs gemma client clientdemo clean all: gemma client +demo: gemma clientdemo + $(ENVWARPPER): @echo "Preparing go build environment:" mkdir -p "$(GOCACHE)" @@ -43,6 +45,9 @@ client: $(MAKE) -f Makefile.build -C client +clientdemo: + $(MAKE) demo -f Makefile.build -C client + install: gemma cp cmd/gemma/gemma $(BINDIR)
--- a/client/Makefile.build Tue Oct 23 07:42:54 2018 +0200 +++ b/client/Makefile.build Tue Oct 23 08:34:44 2018 +0200 @@ -1,11 +1,14 @@ #-*-makefile-*- # Authors: Sascha Wilde <wilde@intevation.de> -.PHONY: all dependencies clean +.PHONY: all demo dependencies clean all: dependencies yarn build +demo: dependencies + yarn build-demo + dependencies: yarn install --check-files
--- a/client/package.json Tue Oct 23 07:42:54 2018 +0200 +++ b/client/package.json Tue Oct 23 08:34:44 2018 +0200 @@ -6,7 +6,7 @@ "run:both": "concurrently \"../cmd/gemma/gemma\" \"vue-cli-service serve\"", "serve": "VUE_APP_HGREV=$(hg id -i) vue-cli-service serve", "build": "vue-cli-service build", - "build-with-rev": "VUE_APP_HGREV=$(hg id -i) vue-cli-service build", + "build-demo": "VUE_APP_HGREV=$(hg id -i) vue-cli-service build", "lint": "vue-cli-service lint", "test:unit": "vue-cli-service test:unit", "test:e2e": "vue-cli-service test:e2e"