diff --git a/Makefile b/Makefile index f5d4af4c..86022e88 100644 --- a/Makefile +++ b/Makefile @@ -31,11 +31,6 @@ all: \ # for someone developing with different submodule pointers. .git_submodule_init.done.log: \ .gitmodules - # UCO-Utility-Pre-0.7.0-Validator - test -r dependencies/UCO-Utility-Pre-0.7.0-Validator/README.md \ - || (git submodule init dependencies/UCO-Utility-Pre-0.7.0-Validator && git submodule update dependencies/UCO-Utility-Pre-0.7.0-Validator) - @test -r dependencies/UCO-Utility-Pre-0.7.0-Validator/README.md \ - || (echo "ERROR:Makefile:UCO-Utility-Pre-0.7.0-Validator submodule README.md file not found, even though UCO-Utility-Pre-0.7.0-Validator submodule initialized." >&2 ; exit 2) # CASE-Utilities-Python test -r dependencies/CASE-Utilities-Python/README.md \ || (git submodule init dependencies/CASE-Utilities-Python && git submodule update dependencies/CASE-Utilities-Python) @@ -76,11 +71,6 @@ all: \ source venv/bin/activate \ && pip install \ dependencies/CASE-Utilities-Python - source venv/bin/activate \ - && cd dependencies/UCO-Utility-Pre-0.7.0-Validator \ - && pip install \ - --editable \ - src touch $@ check: \ @@ -89,7 +79,8 @@ check: \ --directory dependencies \ check $(MAKE) \ - --directory examples/illustrations + --directory examples/illustrations \ + check clean: @$(MAKE) \ diff --git a/dependencies/CASE-Utilities-Python b/dependencies/CASE-Utilities-Python index 22564aec..7d8f6762 160000 --- a/dependencies/CASE-Utilities-Python +++ b/dependencies/CASE-Utilities-Python @@ -1 +1 @@ -Subproject commit 22564aece1e84f81c9fa0537c11fffda55e26cd8 +Subproject commit 7d8f67629dabfcba735a7dfee8a4f7dcad1d916c diff --git a/dependencies/Makefile b/dependencies/Makefile index 54833122..f1666116 100644 --- a/dependencies/Makefile +++ b/dependencies/Makefile @@ -15,40 +15,12 @@ SHELL := /bin/bash top_srcdir := $(shell cd .. ; pwd) -all: \ - case-0.3.0.pkl \ - case-0.4.0.pkl +all: -case-0.3.0.pkl: \ - $(top_srcdir)/.venv.done.log - source $(top_srcdir)/venv/bin/activate \ - && serialize \ - -c case-0.3.0 \ - -o _$@ \ - CASE-0.3.0/ - mv _$@ $@ - -case-0.4.0.pkl: \ - $(top_srcdir)/.venv.done.log - source $(top_srcdir)/venv/bin/activate \ - && serialize \ - -c case-0.4.0 \ - -o _$@ \ - CASE-0.4.0/ - mv _$@ $@ - -check: \ - case-0.3.0.pkl \ - case-0.4.0.pkl +check: $(MAKE) \ --directory CASE-0.3.0 \ check $(MAKE) \ --directory CASE-0.4.0 \ check - source $(top_srcdir)/venv/bin/activate \ - && describe \ - case-0.3.0.pkl - source $(top_srcdir)/venv/bin/activate \ - && describe \ - case-0.4.0.pkl diff --git a/examples/illustrations/exif_data/Makefile b/examples/illustrations/exif_data/Makefile index 3d6d8a6c..0527a7cc 100644 --- a/examples/illustrations/exif_data/Makefile +++ b/examples/illustrations/exif_data/Makefile @@ -18,29 +18,9 @@ top_srcdir := $(shell cd ../../.. ; pwd) all: \ query-select-files.md -.PHONY: \ - check-0.3.0 \ - check-0.4.0 - check: \ - check-0.3.0 \ - check-0.4.0 \ query-select-files.md -check-0.3.0: \ - $(top_srcdir)/.dependencies.done.log - source $(top_srcdir)/venv/bin/activate \ - && validate \ - $(top_srcdir)/dependencies/case-0.3.0.pkl \ - exif_data.json - -check-0.4.0: \ - $(top_srcdir)/.dependencies.done.log - source $(top_srcdir)/venv/bin/activate \ - && validate \ - $(top_srcdir)/dependencies/case-0.4.0.pkl \ - exif_data.json - clean: @rm -f \ query-*.md diff --git a/examples/illustrations/location/Makefile b/examples/illustrations/location/Makefile index 8695e10e..cefb76e0 100644 --- a/examples/illustrations/location/Makefile +++ b/examples/illustrations/location/Makefile @@ -17,24 +17,4 @@ top_srcdir := $(shell cd ../../.. ; pwd) all: -.PHONY: \ - check-0.3.0 \ - check-0.4.0 - -check: \ - check-0.3.0 \ - check-0.4.0 - -check-0.3.0: \ - $(top_srcdir)/.dependencies.done.log - source $(top_srcdir)/venv/bin/activate \ - && validate \ - $(top_srcdir)/dependencies/case-0.3.0.pkl \ - location.json - -check-0.4.0: \ - $(top_srcdir)/.dependencies.done.log - source $(top_srcdir)/venv/bin/activate \ - && validate \ - $(top_srcdir)/dependencies/case-0.4.0.pkl \ - location.json +check: