Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix component version when download from source #931

Merged
merged 7 commits into from
Jan 4, 2024
Merged

Fix component version when download from source #931

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b51160a
add annotation to component downloaded
anitacaron Sep 27, 2023
14a83ef
change input file in the robot command
anitacaron Oct 2, 2023
fafd3e8
copy file to intermediate file to compare later
anitacaron Oct 10, 2023
6d46201
Merge branch 'master' into fix-components
anitacaron Jan 3, 2024
32efc77
split else block into multiple lines
anitacaron Jan 3, 2024
a59f191
Merge branch 'master' into fix-components
Jan 4, 2024
a41a579
Merge branch 'master' into fix-components
Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions template/src/ontology/Makefile.jinja2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,8 +555,11 @@ component-download-{{ component.filename }}: | $(TMPDIR)
remove {% if component.base_iris is not none %}{% for iri in component.base_iris %}--base-iri {{iri}} {% endfor %}{% else %}--base-iri $(OBOBASE)/{{ project.id.upper() }} {% endif %}--axioms external --preserve-structure false --trim false \{% endif %}
annotate --ontology-iri $(ONTBASE)/$@ $(ANNOTATE_ONTOLOGY_VERSION) -o $(TMPDIR)/$@.owl; fi

$(COMPONENTSDIR)/{{ component.filename }}: component-download-{{ component.filename }}
if [ $(COMP) = true ] ; then if cmp -s $(TMPDIR)/component-download-{{ component.filename }}.owl $@ ; then echo "Component identical."; else echo "Component is different, updating." && cp $(TMPDIR)/component-download-{{ component.filename }}.owl $@; fi; fi
$(COMPONENTSDIR)/{{ component.filename }}: component-download-{{ component.filename }}
if [ $(COMP) = true ]; then if cmp -s $(TMPDIR)/component-download-{{ component.filename }}.owl $(TMPDIR)/component-download-{{ component.filename }}.tmp.owl ; then echo "Component identical."; \
anitacaron marked this conversation as resolved.
Show resolved Hide resolved
else echo "Component is different, updating." &&\
cp $(TMPDIR)/component-download-{{ component.filename }}.owl $(TMPDIR)/component-download-{{ component.filename }}.tmp.owl &&\
$(ROBOT) annotate -i $(TMPDIR)/component-download-{{ component.filename }}.owl --ontology-iri $(ONTBASE)/$@ $(ANNOTATE_ONTOLOGY_VERSION) -o $@; fi; fi

.PRECIOUS: $(COMPONENTSDIR)/{{ component.filename }}
{% elif component.use_template %}
Expand Down