From 9799f798d8f84f352aa46e4e923e05e74c68f586 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Mon, 7 Jun 2021 17:06:13 +0900 Subject: tdf#127028 "bpmn" template should have ext. otg instead of ott MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit "bpmn" is an template for draw documents and not text documents (writer) so it should have the extension otg and not ott. This is also important for the template manager as it categorises the templates based on the extension, so the bpmn was not categorised correctly. Change-Id: I503b972711830dc3c5ab98d9c24f974862ffc540 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116775 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl (cherry picked from commit e9a824dd6c1c33777461874d9892343d193c867d) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116907 Reviewed-by: Caolán McNamara --- extras/CustomTarget_tpldraw.mk | 12 ++++++------ extras/Package_tpldraw.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/extras/CustomTarget_tpldraw.mk b/extras/CustomTarget_tpldraw.mk index 69e1f63848b7..ec878697f55a 100644 --- a/extras/CustomTarget_tpldraw.mk +++ b/extras/CustomTarget_tpldraw.mk @@ -25,7 +25,7 @@ extras_DRAW_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_DRAW),$(atexts) $(call gb_CustomTarget_get_target,extras/source/templates/draw) : \ - $(foreach atexts,$(extras_TEMPLATES_DRAW),$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/$(atexts).ott) + $(foreach atexts,$(extras_TEMPLATES_DRAW),$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/$(atexts).otg) $(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/%/mimetype : $(SRCDIR)/extras/source/templates/draw/%/mimetype $(call gb_Output_announce,templates/draw/$*/mimetype,$(true),CPY,1) @@ -70,15 +70,15 @@ $(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/%.xml : $(SRCDI $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_Trace_EndRange,templates/draw/$*.xml,XSL) -$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/%.ott : - $(call gb_Output_announce,templates/draw/$*.ott,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/draw/$*.ott,ZIP) +$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/%.otg : + $(call gb_Output_announce,templates/draw/$*.otg,$(true),ZIP,2) + $(call gb_Trace_StartRange,templates/draw/$*.otg,ZIP) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_DRAW_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_DRAW_MIMEFILES_FILTER) && \ zip -qrX --must-match $@ $(EXTRAS_DRAW_XMLFILES_FILTER) \ ) - $(call gb_Trace_EndRange,templates/draw/$*.ott,ZIP) + $(call gb_Trace_EndRange,templates/draw/$*.otg,ZIP) define extras_Tpldraw_make_file_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ @@ -105,7 +105,7 @@ $(eval $(foreach file,$(extras_DRAW_MIMETYPEFILES) $(extras_DRAW_XMLFILES),\ )) $(eval $(foreach atexts,$(extras_TEMPLATES_DRAW),\ - $(call extras_Tpldraw_make_zip_deps,extras/source/templates/draw,$(atexts).ott,$(atexts)) \ + $(call extras_Tpldraw_make_zip_deps,extras/source/templates/draw,$(atexts).otg,$(atexts)) \ )) # vim: set noet sw=4 ts=4: diff --git a/extras/Package_tpldraw.mk b/extras/Package_tpldraw.mk index b6d72e3eb595..05f03deabc10 100644 --- a/extras/Package_tpldraw.mk +++ b/extras/Package_tpldraw.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Package_Package,extras_tpldraw,$(call gb_CustomTarget_get_workdir,extras/source/templates/draw))) $(eval $(call gb_Package_add_files,extras_tpldraw,$(LIBO_SHARE_FOLDER)/template/common/draw,\ - bpmn.ott \ + bpmn.otg \ )) # vim: set noet sw=4 ts=4: -- cgit v1.2.3