From b0899a2f4fc79e1e980a3539aa6c62371558c1d1 Mon Sep 17 00:00:00 2001 From: Paul Schneider Date: Sat, 28 Apr 2018 23:08:03 +0200 Subject: [PATCH] Life made simpler --- Makefile | 9 ++++++++- cli/Makefile | 6 +++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 58bec8a5..d7fcd675 100644 --- a/Makefile +++ b/Makefile @@ -11,14 +11,21 @@ all: $(SUBDIRS) $(SUBDIRS): $(MAKE) -C $@ VERSION=$(VERSION) +Yavsc.Abstract: + $(MAKE) -C Yavsc.Abstract VERSION=$(VERSION) + Yavsc.Abstract-deploy: $(MAKE) -C Yavsc.Abstract deploy-pkg VERSION=$(VERSION) Yavsc-deploy: Yavsc $(MAKE) -C Yavsc deploy-pkg VERSION=$(VERSION) -Yavsc: Yavsc.Abstract-deploy +Yavsc: Yavsc.Abstract Yavsc.Abstract-deploy make -C Yavsc restore + make -C Yavsc VERSION=$(VERSION) + +cli-: + make -C cli deploy-pkg VERSION=$(VERSION) cli: Yavsc diff --git a/cli/Makefile b/cli/Makefile index 129e4752..10c3ddf7 100644 --- a/cli/Makefile +++ b/cli/Makefile @@ -5,6 +5,8 @@ all: build build: project.lock.json dnu build +deploy-pkg: + restore: touch project.json @@ -13,10 +15,8 @@ restore: project.lock.json: project.json dnu restore -run: ../Yavsc/bin/Debug/dnx451/Yavsc.dll +run: project.lock.json ASPNET_ENV=Development ASPNET_LOG_LEVEL=Debug dnx run -../Yavsc/bin/Debug/dnx451/Yavsc.dll: - make -C ../Yavsc