Change OWL shapes review to use CDO shapes separated from UCO

A follow-on patch will regenerate Make-managed files. Signed-off-by: Alex Nelson <[email protected]>
ucoProject · Sep 11, 2023 · 0a5ed8b · 0a5ed8b
1 parent a144470
commit 0a5ed8b
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -2,3 +2,7 @@
 	path = dependencies/CDO-Shapes-FOAF
 	url = https://github.com/Cyber-Domain-Ontology/CDO-Shapes-FOAF.git
 	branch = main
+[submodule "dependencies/UCO"]
+	path = dependencies/UCO
+	url = https://github.com/ucoProject/UCO.git
+	branch = master
diff --git a/Makefile b/Makefile
@@ -50,6 +50,10 @@ all: \
   .git_submodule_init_imports.done.log
 	git submodule update \
 	  --init
+	$(MAKE) \
+	  --directory dependencies/UCO \
+	  .git_submodule_init.done.log \
+	  .lib.done.log
 	touch $@
 
 .venv.done.log: \

diff --git a/dependencies/CDO-Shapes-FOAF b/dependencies/CDO-Shapes-FOAF
diff --git a/dependencies/Makefile b/dependencies/Makefile
@@ -18,7 +18,7 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd .. ; pwd)
 
-uco_srcdir := $(top_srcdir)/dependencies/CDO-Shapes-FOAF/dependencies/UCO
+uco_srcdir := $(top_srcdir)/dependencies/UCO
 
 all: \
   catalog-v001.xml

diff --git a/dependencies/UCO b/dependencies/UCO
diff --git a/etc/domain_directories.tsv b/etc/domain_directories.tsv
@@ -1,2 +1,2 @@
 https://example.org/	${top_srcdir}/ontology/
-https://ontology.unifiedcyberontology.org/	${top_srcdir}/dependencies/CDO-Shapes-FOAF/dependencies/UCO/ontology/
+https://ontology.unifiedcyberontology.org/	${top_srcdir}/dependencies/UCO/ontology/
diff --git a/ontology/Makefile b/ontology/Makefile
@@ -18,7 +18,7 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd .. ; pwd)
 
-uco_srcdir := $(top_srcdir)/dependencies/CDO-Shapes-FOAF/dependencies/UCO
+uco_srcdir := $(top_srcdir)/dependencies/UCO
 
 RDF_TOOLKIT_JAR := $(uco_srcdir)/lib/rdf-toolkit.jar
 

diff --git a/tests/Makefile b/tests/Makefile
@@ -18,7 +18,9 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd .. ; pwd)
 
-uco_srcdir := $(top_srcdir)/dependencies/CDO-Shapes-FOAF/dependencies/UCO
+cdo_owl_srcdir := $(top_srcdir)/dependencies/CDO-Shapes-FOAF/dependencies/CDO-Shapes-OWL
+
+uco_srcdir := $(top_srcdir)/dependencies/UCO
 
 profile_ttls := $(wildcard $(top_srcdir)/ontology/uco-*.ttl)
 
@@ -57,10 +59,11 @@ clean:
 	  monolithic.ttl
 
 monolithic.ttl: \
-  $(top_srcdir)/.venv.done.log \
-  $(top_srcdir)/dependencies/imports-transitive.ttl \
+  $(cdo_owl_srcdir)/shapes/sh-owl.ttl \
   $(profile_ttls) \
-  $(shape_ttls)
+  $(shape_ttls) \
+  $(top_srcdir)/.venv.done.log \
+  $(top_srcdir)/dependencies/imports-transitive.ttl
 	$(MAKE) \
 	  --directory $(uco_srcdir) \
 	  .venv.done.log
@@ -79,6 +82,6 @@ monolithic.ttl: \
 	    > _$@
 	source $(top_srcdir)/venv/bin/activate \
 	  && pyshacl \
-	    --shacl $(uco_srcdir)/ontology/owl/owl.ttl \
+	    --shacl $(cdo_owl_srcdir)/shapes/sh-owl.ttl \
 	    _$@
 	mv _$@ $@