@@ -400,9 +400,7 @@ ASSETS = \
400400 cause problems down the road (notably, it would prevent the use of a
401401 single rsync commmand to copy all release assets except mappings to
402402 the release directory). Basically, this is "all release assets that
403- are in this src/ontology directory".
404- This also does not include pattern-derived files, and it is unclear
405- whether this is by design or not, see #1243. -#}
403+ are in this src/ontology directory". -#}
406404RELEASE_ASSETS = \
407405 $(MAIN_FILES) {% if project .import_group is defined %}{% if project .import_group .release_imports %} $(IMPORT_FILES) {% endif %}{% endif %} \
408406 $(SUBSET_FILES){% if project .robot_report .release_reports %} \
@@ -452,14 +450,11 @@ prepare_release_fast:
452450copy_release_files:
453451 rsync -R $(RELEASE_ASSETS) $(RELEASEDIR){% if project .sssom_mappingset_group is defined %}{% if project .sssom_mappingset_group .released_products is defined %}
454452 mkdir -p $(RELEASEDIR)/mappings
455- cp -rf $(RELEASED_MAPPING_FILES) $(RELEASEDIR)/mappings{% endif %}{% endif %}{% if project .use_dosdps %}
456- mkdir -p $(RELEASEDIR)/patterns
457- cp -rf $(PATTERN_RELEASE_FILES) $(RELEASEDIR)/patterns{% endif %}
453+ cp -rf $(RELEASED_MAPPING_FILES) $(RELEASEDIR)/mappings{% endif %}{% endif %}
458454
459455# All released assets, in their final location within the release
460456{# ODK devs: keep that in sync with the copy_release_files rule above
461- -- that is, this should list all files copied by that rule (except
462- the pattern-derived files, whose status is unclear; see #1243). -#}
457+ -- that is, this should list all files copied by that rule. -#}
463458RELEASE_ASSETS_AFTER_RELEASE=$(foreach n,$(RELEASE_ASSETS), $(RELEASEDIR)/$(n)){% if project .sssom_mappingset_group is defined %}{% if project .sssom_mappingset_group .released_products is defined %} \
464459 $(foreach n,$(RELEASED_MAPPINGS), $(RELEASEDIR)/mappings/$(n).sssom.tsv){% endif %}{% endif %}
465460
0 commit comments