From c29faa9d865d572bd30e948fed1b214a72440bca Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Wed, 29 Jan 2020 08:57:42 +1000 Subject: [PATCH] run rs checks before setting up py env --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4f06e7f55..205e46c09 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,8 @@ SUBMAKE := $(MAKE) --print-directory BUILDFLAGS := --release --strip RUNFLAGS := -CHECKABLE := rslib pylib qt +CHECKABLE_PY := pylib qt +CHECKABLE_RS := rslib DEVEL := rspy pylib qt .PHONY: all @@ -80,10 +81,13 @@ clean-dist: .PHONY: check check: pyenv buildhash @set -e && \ + for dir in $(CHECKABLE_RS); do \ + $(SUBMAKE) -C $$dir check; \ + done; \ . pyenv/bin/activate && \ $(SUBMAKE) -C rspy develop && \ $(SUBMAKE) -C pylib develop && \ - for dir in $(CHECKABLE); do \ + for dir in $(CHECKABLE_PY); do \ $(SUBMAKE) -C $$dir check; \ done; @echo @@ -93,7 +97,7 @@ check: pyenv buildhash fix: @set -e && \ . pyenv/bin/activate && \ - for dir in $(CHECKABLE); do \ + for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \ $(SUBMAKE) -C $$dir fix; \ done; \