Skip to content
Merged
Changes from all commits
Commits
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
16 changes: 7 additions & 9 deletions src/incatools/odk/templates/src/ontology/Makefile.jinja2
Original file line number Diff line number Diff line change
Expand Up @@ -1111,18 +1111,19 @@ EXTERNAL_PATTERN_FILES = $(notdir $(EXTERNAL_PATTERN_URLS))
pattern_clean:
rm -f $(PATTERN_CLEAN_FILES)

ifeq ($(PAT),true)

.PHONY: patterns dosdp
patterns dosdp: dosdp_validation $(PATTERNDIR)/pattern.owl $(PATTERNDIR)/definitions.owl

.PHONY: pattern_schema_checks
# Validation only reads the pattern files, so it runs regardless of PAT

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don’t really like the idea of changing the meaning of PAT from “all pattern-related workflows” to “all pattern-related workflows EXCEPT validation of patterns” – but then again, I also didn’t very much like the idea of redefining dosdp_validation to make it a dummy target under PAT=false, so all things considered…

.PHONY: pattern_schema_checks dosdp_validation
pattern_schema_checks dosdp_validation: $(TMPDIR)/stamp-pattern-schema-checks

$(TMPDIR)/stamp-pattern-schema-checks: $(ALL_PATTERN_FILES) | $(TMPDIR)
$(PATTERN_TESTER) $(PATTERNDIR)/dosdp-patterns
touch $@

ifeq ($(PAT),true)

.PHONY: patterns dosdp
patterns dosdp: dosdp_validation $(PATTERNDIR)/pattern.owl $(PATTERNDIR)/definitions.owl

.PHONY: download_patterns
download_patterns: | $(TMPDIR)
mkdir -p $(TMPDIR)/dosdp
Expand Down Expand Up @@ -1307,9 +1308,6 @@ else # PAT=false
$(TMPDIR)/all_pattern_terms.txt: $(PATTERNDIR)/definitions.owl
$(ROBOT) query --input $< --use-graphs true --format csv \
--query $(SPARQLDIR)/terms.sparql $@

# Dummy target to allow "make test" to skip DOSDP validation under PAT=false
dosdp_validation:
endif


Expand Down
Loading