From 56689d12de486e4bc9b99eb96dec4dbc50b41a3b Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Thu, 13 Jun 2024 02:55:02 +0200 Subject: [PATCH] chore(Makefile): conditionally depend on .develop.env; add uniworx:dev flag to stack iff dev --- Makefile | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 89a17b034..d2b5b762f 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ db ?= -cf -dev ?= --flag uniworx:dev .PHONY: help help: @@ -19,12 +18,16 @@ lint: frontend-lint backend-lint test: frontend-test backend-test i18n-check .PHONY: backend-% -backend-%: .develop.env .stack-work.lock # --stack-work-$* - $(MAKE) -- --backend-$* +backend-%: # .stack-work.lock # --stack-work-$* + $(MAKE) -- --backend-$*-dev #( $(MAKE) -- --backend-$* || $(MAKE) -- --stack-krow-$* ) && ( $(MAKE) -- --stack-krow-$* ) +.PHONY: --backend-%-dev +--backend-%-dev: .develop.env + $(MAKE) -- --backend-$* dev=--flag\ uniworx:dev + .PHONY: --backend-build ---backend-build: .develop.env +--backend-build: stack build --fast --profile --library-profiling --executable-profiling $(dev) --flag uniworx:-library-only #.PHONY: --backend-start @@ -32,7 +35,7 @@ backend-%: .develop.env .stack-work.lock # --stack-work-$* # ./start.sh .PHONY: --backend-lint ---backend-lint: .develop.env +--backend-lint: stack build --test --fast $(dev) --flag uniworx:library-only uniworx:test:hlint .PHONY: backend-dependencies @@ -40,7 +43,7 @@ backend-dependencies: stack build --fast --only-dependencies .PHONY: --backend-test ---backend-test: .develop.env +--backend-test: stack build --test --coverage --fast $(dev) --flag uniworx:library-only .PHONY: i18n-check @@ -49,12 +52,12 @@ i18n-check: @echo No missing translations. .PHONY: database -database: .develop.env .stack-work.lock # --stack-work-build +database: .stack-work.lock # --stack-work-build $(MAKE) -- --database # ( $(MAKE) -- --database || $(MAKE) -- --stack-krow-build ) && ( $(MAKE) -- --stack-krow-build ) .PHONY: --database ---database: .stack-work.lock .develop.env +--database: .stack-work.lock stack build --fast --flag uniworx:-library-only $(dev) export SERVER_SESSION_ACID_FALLBACK=$${SERVER_SESSION_ACID_FALLBACK:-true} export AVSPASS=$${AVSPASS:-nopasswordset}