run rs checks before setting up py env

This commit is contained in:
Damien Elmes 2020-01-29 08:57:42 +10:00
parent d94a86930f
commit c29faa9d86

View file

@ -8,7 +8,8 @@ SUBMAKE := $(MAKE) --print-directory
BUILDFLAGS := --release --strip BUILDFLAGS := --release --strip
RUNFLAGS := RUNFLAGS :=
CHECKABLE := rslib pylib qt CHECKABLE_PY := pylib qt
CHECKABLE_RS := rslib
DEVEL := rspy pylib qt DEVEL := rspy pylib qt
.PHONY: all .PHONY: all
@ -80,10 +81,13 @@ clean-dist:
.PHONY: check .PHONY: check
check: pyenv buildhash check: pyenv buildhash
@set -e && \ @set -e && \
for dir in $(CHECKABLE_RS); do \
$(SUBMAKE) -C $$dir check; \
done; \
. pyenv/bin/activate && \ . pyenv/bin/activate && \
$(SUBMAKE) -C rspy develop && \ $(SUBMAKE) -C rspy develop && \
$(SUBMAKE) -C pylib develop && \ $(SUBMAKE) -C pylib develop && \
for dir in $(CHECKABLE); do \ for dir in $(CHECKABLE_PY); do \
$(SUBMAKE) -C $$dir check; \ $(SUBMAKE) -C $$dir check; \
done; done;
@echo @echo
@ -93,7 +97,7 @@ check: pyenv buildhash
fix: fix:
@set -e && \ @set -e && \
. pyenv/bin/activate && \ . pyenv/bin/activate && \
for dir in $(CHECKABLE); do \ for dir in $(CHECKABLE_RS) $(CHECKABLE_PY); do \
$(SUBMAKE) -C $$dir fix; \ $(SUBMAKE) -C $$dir fix; \
done; \ done; \