From 3c6b013d7296278ec53d4c4ba840ec256ded5263 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Tue, 27 Jun 2017 03:46:43 +0200 Subject: [PATCH] DIB --- Yavsc/Makefile | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/Yavsc/Makefile b/Yavsc/Makefile index 13947306..3e5a98ae 100644 --- a/Yavsc/Makefile +++ b/Yavsc/Makefile @@ -2,6 +2,9 @@ DESTDIR=/srv/www/yavscpre PRODDESTDIR=/srv/www/yavsc ASPNET_ENV=Development +all: project.lock.json + dnu build + git_status := $(shell git status -s --porcelain |wc -l) status: @@ -13,13 +16,19 @@ endif default: pushInPre -watch: +project.lock.json: project.json + dnu restore + +watch: project.lock.json @ASPNET_ENV=$(ASPNET_ENV) dnx-watch web --configuration=Debug run: @ASPNET_ENV=$(ASPNET_ENV) dnx web --configuration=Debug clean: + rm -rf bin obj + +cleanoutput: @rm -rf bin/Release @rm -rf bin/output @@ -32,14 +41,14 @@ bin/output: bin/Release bin/output/wwwroot/version: bin/output @git log -1 --pretty=format:%h > bin/output/wwwroot/version -pushInPre: bin/output/wwwroot/version +pushInPre: cleanoutput bin/output/wwwroot/version ssh root@localhost systemctl stop kestrel-pre ssh root@localhost rm -rf $(DESTDIR)/approot (cd bin/output && rsync -ravu ./ root@localhost:$(DESTDIR) >/dev/null) ssh root@localhost sync ssh root@localhost systemctl start kestrel-pre -pushInProd: bin/output/wwwroot/version +pushInProd: cleanoutput bin/output/wwwroot/version ifeq ($(git_status),0) ssh root@localhost systemctl stop kestrel ssh root@localhost rm -rf $(PRODDESTDIR)/approot