Move validation results to illustration base directory

This lets the illustration-nosrc.mk file be a consistent mechanism for
generating validation results.

Signed-off-by: Alex Nelson <[email protected]>

Author: ajnelson-nist

examples/illustrations/inference/src/inference_validation.ttl renamed to examples/illustrations/inference/inference_validation.ttl

@@ -23,6 +23,8 @@ all:
 	  --directory src
 	cp src/generated-README.md README.md
 	cp src/generated-inference.json inference.json
+	$(MAKE) \
+	  --file ../src/illustration-nosrc.mk
 
 check:
 	$(MAKE) \
@@ -32,6 +34,9 @@ check:
 	$(MAKE) \
 	  --directory src \
 	  check
+	$(MAKE) \
+	  --file ../src/illustration-nosrc.mk \
+	  check
 	diff \
 	  src/generated-inference.json \
 	  inference.json \
@@ -42,6 +47,9 @@ check:
 	  || (echo "UPDATE:examples/illustrations/inference/Makefile:The generated README.md does not match the Git-tracked README.md.  If the above reported changes look fine, run 'cp src/generated-README.md README.md' to get a file ready to commit to Git." >&2 ; exit 1)
 
 clean:
+	@$(MAKE) \
+	  --file ../src/illustration-nosrc.mk \
+	  clean
 	@$(MAKE) \
 	  --directory src \
 	  clean

examples/illustrations/src/illustration-basedir.mk

@@ -15,8 +15,6 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd ../../../.. ; pwd)
 
-RDF_TOOLKIT_JAR := $(top_srcdir)/dependencies/CASE-Utilities-Python/dependencies/CASE/lib/rdf-toolkit.jar
-
 illustration_name := $(shell cd .. ; basename $$PWD)
 illustration_snippets_json := $(wildcard $(illustration_name)-*.json)
 query_sparql_files := $(wildcard query-*.sparql)
@@ -28,42 +26,16 @@ generated_readme_sed_sources := \
   $(query_sparql_files)
 
 all: \
-  $(illustration_name)_validation.ttl \
   generated-README.md
 
 .PHONY: \
   normalize
 
-$(illustration_name)_validation.ttl: \
-  generated-$(illustration_name).json \
-  ../drafting.ttl \
-  $(RDF_TOOLKIT_JAR) \
-  $(top_srcdir)/.venv.done.log
-	rm -f __$@
-	source $(top_srcdir)/venv/bin/activate \
-	  && case_validate \
-	    --format turtle \
-	    --ontology-graph ../drafting.ttl \
-	    --output __$@ \
-	    $< \
-	    ; rc=$$? ; test 0 -eq $$rc -o 1 -eq $$rc
-	test -s __$@
-	java -jar $(RDF_TOOLKIT_JAR) \
-	  --inline-blank-nodes \
-	  --source __$@ \
-	  --source-format turtle \
-	  --target _$@ \
-	  --target-format turtle
-	rm __$@
-	mv _$@ $@
-
-check: \
-  $(illustration_name)_validation.ttl
+check:
 
 clean:
 	@rm -f \
 	  *.sed \
-	  $(illustration_name)_validation.ttl \
 	  .normalized-* \
 	  generated-* \
 	  query-*.md