Merge pull request #234 from mcwdsi/include-language-individuals

updated to include language-individuals component in build
mcwdsi · May 6, 2024 · dc65631 · dc65631
2 parents 1528a75 + 3ac86a3
commit dc65631
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 4 deletions.
diff --git a/docs/odk-workflows/RepositoryFileStructure.md b/docs/odk-workflows/RepositoryFileStructure.md
@@ -39,4 +39,8 @@ Components, in contrast to imports, are considered full members of the ontology.
 2. A part of the ontology is managed in ROBOT templates
 3. The expressivity of the component is higher than the format of the edit file. For example, people still choose to manage their ontology in OBO format (they should not) missing out on a lot of owl features. They may choose to manage logic that is beyond OBO in a specific OWL component.
 
+These are the components in OMRSE
 
+| Filename | URL |
+| -------- | --- |
+| language/language-individuals.owl | None |
diff --git a/src/ontology/Makefile b/src/ontology/Makefile
@@ -57,7 +57,7 @@ OBODATE ?=                  $(shell date +'%d:%m:%Y %H:%M')
 VERSION=                    $(TODAY)
 ANNOTATE_ONTOLOGY_VERSION = annotate -V $(ONTBASE)/releases/$(VERSION)/$@ --annotation owl:versionInfo $(VERSION)
 ANNOTATE_CONVERT_FILE =     annotate --ontology-iri $(ONTBASE)/$@ $(ANNOTATE_ONTOLOGY_VERSION) convert -f ofn --output $@.tmp.owl && mv $@.tmp.owl $@
-OTHER_SRC =                 
+OTHER_SRC =                 $(COMPONENTSDIR)/language/language-individuals.owl 
 ONTOLOGYTERMS =             $(TMPDIR)/ontologyterms.txt
 EDIT_PREPROCESSED =         $(TMPDIR)/$(ONT)-preprocess.owl
 
@@ -407,6 +407,38 @@ refresh-%:
 no-mirror-refresh-%:
 	$(MAKE) IMP=true IMP_LARGE=true MIR=false PAT=false $(IMPORTDIR)/$*_import.owl -B
 
+
+# ----------------------------------------
+# Components
+# ----------------------------------------
+# Some ontologies contain external and internal components. A component is included in the ontology in its entirety.
+
+COMP=true # Global parameter to bypass component generation
+
+.PHONY: all_components
+all_components: $(OTHER_SRC)
+
+.PHONY: recreate-components
+recreate-components:
+	$(MAKE) COMP=true IMP=false MIR=true PAT=true IMP_LARGE=false all_components -B
+
+.PHONY: no-mirror-recreate-components
+no-mirror-recreate-components:
+	$(MAKE) COMP=true IMP=false MIR=false PAT=true IMP_LARGE=false all_components -B
+
+.PHONY: recreate-%
+recreate-%:
+	$(MAKE) COMP=true IMP=false IMP_LARGE=false MIR=true PAT=true $(COMPONENTSDIR)/$*.owl -B
+
+.PHONY: no-mirror-recreate-%
+no-mirror-recreate-%:
+	$(MAKE) COMP=true IMP=false IMP_LARGE=false MIR=false PAT=true $(COMPONENTSDIR)/$*.owl -B
+
+$(COMPONENTSDIR)/%: | $(COMPONENTSDIR)
+	touch $@
+.PRECIOUS: $(COMPONENTSDIR)/%
+
+
 # ----------------------------------------
 # Mirroring upstream ontologies
 # ----------------------------------------

diff --git a/src/ontology/catalog-v001.xml b/src/ontology/catalog-v001.xml
@@ -37,5 +37,6 @@
         <uri name="http://purl.obolibrary.org/obo/omrse/components/pno.owl" uri="components/pno.owl"/>
         <uri name="http://purl.obolibrary.org/obo/omrse/components/d-acts.owl" uri="components/d-acts.owl"/>
         <uri name="http://purl.obolibrary.org/obo/omrse/components/import_terms.owl" uri="components/import_terms.owl"/>
+        <uri name="http://purl.obolibrary.org/obo/omrse/language-individuals/" uri="components/language/language-individuals.owl"/>
     </group>
 </catalog>
diff --git a/src/ontology/omrse-edit.owl b/src/ontology/omrse-edit.owl
@@ -28,6 +28,7 @@ Import(<http://purl.obolibrary.org/obo/omrse/imports/pco_import.owl>)
 Import(<http://purl.obolibrary.org/obo/omrse/imports/pno_import.owl>)
 Import(<http://purl.obolibrary.org/obo/omrse/imports/ro_import.owl>)
 Import(<http://purl.obolibrary.org/obo/omrse/releases/2023-09-08/imports/mf_import.owl>)
+Import(<http://purl.obolibrary.org/obo/omrse/language-individuals/>)
 Annotation(dc:contributor "Barry Smith"@en)
 Annotation(dc:contributor "Chris Stoeckert"@en)
 Annotation(dc:contributor "Daniel Welch"@en)

diff --git a/src/ontology/omrse-odk.yaml b/src/ontology/omrse-odk.yaml
@@ -55,10 +55,10 @@ import_group:
     - id: geo
     - id: mf
 
-#components:
-#  products:
+components:
+  products:
     #- filename: education/omrse-education.owl
-    #- filename: language/language-individuals.owl
+    - filename: language/language-individuals.owl
     #- filename: language/omrse-language.owl
     #- filename: omrse-core.owl
 #    - filename: import_terms.owl