Delegate rdf-toolkit provisioning to UCO build process

This patch removes all handling of rdf-toolkit.jar from the CASE ontology repository. UCO had adopted CASE's rdf-toolkit retrieval in version 0.7.0, and now UCO Issue 373 will be upgrading the retrieval process. This patch handles delegation of rdf-toolkit provisioning. A follow-on patch will handle the rdf-toolkit and Java upgrade that is the focus of UCO Issue 373. References: * ucoProject/UCO#373 Signed-off-by: Alex Nelson <[email protected]>
casework · Jun 2, 2022 · ea754f2 · ea754f2
1 parent 180c80a
commit ea754f2
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 56 deletions.
diff --git a/Makefile b/Makefile
@@ -31,13 +31,14 @@ all:
 	  .git_submodule_init.done.log
 	touch $@
 
-.lib.done.log:
+.lib.done.log: \
+  .git_submodule_init.done.log
 	$(MAKE) \
-	  --directory lib
+	  --directory dependencies/UCO \
+	  .lib.done.log
 	touch $@
 
 check: \
-  .git_submodule_init.done.log \
   .lib.done.log
 	$(MAKE) \
 	  --directory ontology \

diff --git a/lib/.gitignore b/lib/.gitignore
diff --git a/lib/Makefile b/lib/Makefile
diff --git a/lib/rdf-toolkit.jar.sha512 b/lib/rdf-toolkit.jar.sha512
diff --git a/ontology/investigation/Makefile b/ontology/investigation/Makefile
@@ -18,7 +18,7 @@ all:
 .check-investigation.ttl: \
   $(top_srcdir)/.lib.done.log \
   investigation.ttl
-	java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
+	java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
 	  --infer-base-iri \
 	  --inline-blank-nodes \
 	  --source investigation.ttl \

diff --git a/ontology/master/Makefile b/ontology/master/Makefile
@@ -18,7 +18,7 @@ all:
 .check-case.ttl: \
   $(top_srcdir)/.lib.done.log \
   case.ttl
-	java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
+	java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
 	  --infer-base-iri \
 	  --inline-blank-nodes \
 	  --source case.ttl \

diff --git a/ontology/vocabulary/Makefile b/ontology/vocabulary/Makefile
@@ -18,7 +18,7 @@ all:
 .check-vocabulary.ttl: \
   $(top_srcdir)/.lib.done.log \
   vocabulary.ttl
-	java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
+	java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
 	  --infer-base-iri \
 	  --inline-blank-nodes \
 	  --source vocabulary.ttl \

diff --git a/tests/Makefile b/tests/Makefile
@@ -56,7 +56,7 @@ case_monolithic.ttl: \
 	    __$@ \
 	    $(case_turtle_files) \
 	    $(uco_turtle_files)
-	java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
+	java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
 	  --infer-base-iri \
 	  --inline-blank-nodes \
 	  --source __$@ \

diff --git a/tests/examples/Makefile b/tests/examples/Makefile
@@ -49,7 +49,7 @@ all: \
 	    --output __$@ \
 	    $< \
 	    ; rc=$$? ; test 0 -eq $$rc -o 1 -eq $$rc
-	java -jar $(top_srcdir)/lib/rdf-toolkit.jar \
+	java -jar $(top_srcdir)/dependencies/UCO/lib/rdf-toolkit.jar \
 	  --inline-blank-nodes \
 	  --source __$@ \
 	  --source-format turtle \