Repository.mk | 6 --
extras/CustomTarget_templates.mk | 105 +++++++++++++++++++++++++++++++++++++
extras/CustomTarget_tpl_styles.mk | 60 ---------------------
extras/CustomTarget_tpldraw.mk | 53 ------------------
extras/CustomTarget_tplofficorr.mk | 60 ---------------------
extras/CustomTarget_tploffimisc.mk | 56 -------------------
extras/CustomTarget_tplpersonal.mk | 60 ---------------------
extras/Module_extras.mk | 12 ----
extras/Package_templates.mk | 24 ++++++++
extras/Package_tpl_styles.mk | 18 ------
extras/Package_tpldraw.mk | 16 -----
extras/Package_tplofficorr.mk | 17 -----
extras/Package_tploffimisc.mk | 16 -----
extras/Package_tplpersonal.mk | 17 -----
14 files changed, 132 insertions(+), 388 deletions(-)
New commits:
commit 949d095eed47fdf8b320fdcff5a8dbdc92cd5d6c
Author: Laurent BP <laurent.balland-poir...@laposte.net>
AuthorDate: Thu Jul 21 12:38:11 2022 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Fri Oct 14 10:48:19 2022 +0200
Merge makefiles of Writer and Draw templates
Simplify the list of files in the same way as for wizard templates
Change-Id: If93374de161b670a96b9d2447f03f29d8c085efa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141274
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/Repository.mk b/Repository.mk
index 7c3de2595dfd..0ff1f9aac413 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -951,12 +951,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
extras_persona_pink \
extras_persona_sand \
extras_persona_white \
- extras_tplofficorr \
- extras_tploffimisc \
+ extras_templates \
extras_tplpresnt \
- extras_tpl_styles \
- extras_tpldraw \
- extras_tplpersonal \
extras_tplwizbitmap \
extras_tplwizdesktop \
extras_tplwizard \
diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk
new file mode 100644
index 000000000000..3b7e8884f488
--- /dev/null
+++ b/extras/CustomTarget_templates.mk
@@ -0,0 +1,105 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates))
+
+# # for OTT templates: mimetype, styles.xml, META-INF/manifest.xml and
+# Thumbnails/thumbnail.png files are automatically added for each template
+# # for OTG templates: mimetype, content.xml, styles.xml,
META-INF/manifest.xml and
+# Thumbnails/thumbnail.png files are automatically added for each template
+# list of meta.xml files (one per template) + other files (content.xml,
manifest.rdf, settings.xml, pictures...)
+extras_TEMPLATES_XMLFILES := \
+ officorr/Modern_business_letter_sans_serif/meta.xml \
+ officorr/Modern_business_letter_serif/meta.xml \
+ offimisc/Businesscard-with-logo/meta.xml \
+ personal/CV/meta.xml \
+ personal/Resume1page/meta.xml \
+ styles/Default/meta.xml \
+ styles/Modern/meta.xml \
+ styles/Simple/meta.xml \
+ officorr/Modern_business_letter_sans_serif/content.xml \
+ officorr/Modern_business_letter_serif/content.xml \
+ offimisc/Businesscard-with-logo/content.xml \
+ personal/CV/content.xml \
+ personal/Resume1page/content.xml \
+ officorr/Modern_business_letter_sans_serif/manifest.rdf \
+ officorr/Modern_business_letter_serif/manifest.rdf \
+ offimisc/Businesscard-with-logo/manifest.rdf \
+ personal/CV/manifest.rdf \
+ personal/Resume1page/manifest.rdf \
+ offimisc/Businesscard-with-logo/settings.xml \
+
offimisc/Businesscard-with-logo/Pictures/10000201000001F4000000A0108F3F06.png \
+ draw/bpmn/meta.xml \
+
+# param: style-base (e.g. Modern)
+extras_TEMPLATES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_TEMPLATES_XMLFILES)))
+
+.SECONDEXPANSION:
+# secondexpansion since the patterns not just cover a filename portion, but
also include a
+# directory portion with different number of elements
+# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
+$(call gb_CustomTarget_get_workdir,extras/source/templates)/% :
$(SRCDIR)/extras/source/templates/% \
+ | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*).dir
+ $(call gb_Output_announce,templates/$*,$(true),CPY,1)
+ $(call gb_Trace_StartRange,templates/$*,CPY)
+ cp $< $@
+ $(call gb_Trace_EndRange,templates/$*,CPY)
+
+# test and copy xml files
+$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.xml :
$(SRCDIR)/extras/source/templates/%.xml \
+ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
+ $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*.xml).dir
+ $(call gb_Output_announce,templates/$*.xml,$(true),XSL,1)
+ $(call gb_Trace_StartRange,templates/$*.xml,XSL)
+ $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $<
+ $(call gb_Trace_EndRange,templates/$*.xml,XSL)
+
+# zip files to OTT
+$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.ott : \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ META-INF/manifest.xml $$(call
extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ Thumbnails/thumbnail.png $$(call
extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
+ $(call gb_Output_announce,templates/$*.ott,$(true),ZIP,2)
+ $(call gb_Trace_StartRange,templates/$*.ott,ZIP)
+ $(call gb_Helper_abbreviate_dirs,\
+ cd $(dir $<) && \
+ zip -q0X --filesync --must-match $@ mimetype && \
+ zip -qrX --must-match $@ styles.xml META-INF/manifest.xml
Thumbnails/thumbnail.png && \
+ zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*) \
+ )
+ $(call gb_Trace_EndRange,templates/$*.ott,ZIP)
+
+# zip files to OTG
+$(call gb_CustomTarget_get_workdir,extras/source/templates)/%.otg : \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ content.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ META-INF/manifest.xml $$(call
extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \
+ $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates)/$$*/,\
+ Thumbnails/thumbnail.png $$(call
extras_TEMPLATES_XMLFILES_RELATIVE,$$*) )
+ $(call gb_Output_announce,templates/$*.otg,$(true),ZIP,2)
+ $(call gb_Trace_StartRange,templates/$*.otg,ZIP)
+ $(call gb_Helper_abbreviate_dirs,\
+ cd $(dir $<) && \
+ zip -q0X --filesync --must-match $@ mimetype && \
+ zip -qrX --must-match $@ content.xml styles.xml
META-INF/manifest.xml Thumbnails/thumbnail.png && \
+ zip -qrX --must-match $@ $(call
extras_TEMPLATES_XMLFILES_RELATIVE,$*) \
+ )
+ $(call gb_Trace_EndRange,templates/$*.otg,ZIP)
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_tpl_styles.mk
b/extras/CustomTarget_tpl_styles.mk
deleted file mode 100644
index 6f1cce959d62..000000000000
--- a/extras/CustomTarget_tpl_styles.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/styles))
-
-extras_STYLES_XMLFILES := \
- Default/META-INF/manifest.xml \
- Default/meta.xml \
- Default/styles.xml \
- Default/Thumbnails/thumbnail.png \
- Modern/META-INF/manifest.xml \
- Modern/meta.xml \
- Modern/styles.xml \
- Modern/Thumbnails/thumbnail.png \
- Simple/META-INF/manifest.xml \
- Simple/meta.xml \
- Simple/styles.xml \
- Simple/Thumbnails/thumbnail.png \
-
-# param: style-base (e.g. Modern)
-extras_STYLES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_STYLES_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but
also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/% :
$(SRCDIR)/extras/source/templates/styles/% \
- | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/styles)/$$*).dir
- $(call gb_Output_announce,templates/styles/$*,$(true),CPY,1)
- $(call gb_Trace_StartRange,templates/styles/$*,CPY)
- cp $< $@
- $(call gb_Trace_EndRange,templates/styles/$*,CPY)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.xml :
$(SRCDIR)/extras/source/templates/styles/%.xml \
- | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/styles)/$$*.xml).dir
- $(call gb_Output_announce,templates/styles/$*.xml,$(true),XSL,1)
- $(call gb_Trace_StartRange,templates/styles/$*.xml,XSL)
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $<
- $(call gb_Trace_EndRange,templates/styles/$*.xml,XSL)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.ott : \
- $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates/styles)/$$*/,\
- mimetype $$(call extras_STYLES_XMLFILES_RELATIVE,$$*))
- $(call gb_Output_announce,templates/styles/$*.ott,$(true),ZIP,2)
- $(call gb_Trace_StartRange,templates/styles/$*.ott,ZIP)
- $(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_STYLES_XMLFILES_RELATIVE,$*) \
- )
- $(call gb_Trace_EndRange,templates/styles/$*.ott,ZIP)
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_tpldraw.mk b/extras/CustomTarget_tpldraw.mk
deleted file mode 100644
index 8de8d0d75a12..000000000000
--- a/extras/CustomTarget_tpldraw.mk
+++ /dev/null
@@ -1,53 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/draw))
-
-extras_DRAW_XMLFILES := \
- bpmn/content.xml \
- bpmn/META-INF/manifest.xml \
- bpmn/meta.xml \
- bpmn/styles.xml \
- bpmn/Thumbnails/thumbnail.png \
-
-# param: style-base (e.g. Modern)
-extras_DRAW_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_DRAW_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but
also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/% :
$(SRCDIR)/extras/source/templates/draw/% \
- | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/draw)/$$*).dir
- $(call gb_Output_announce,templates/draw/$*,$(true),CPY,1)
- $(call gb_Trace_StartRange,templates/draw/$*,CPY)
- cp $< $@
- $(call gb_Trace_EndRange,templates/draw/$*,CPY)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/draw)/%.xml :
$(SRCDIR)/extras/source/templates/draw/%.xml \
- | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/draw)/$$*.xml).dir
- $(call gb_Output_announce,templates/draw/$*.xml,$(true),XSL,1)
- $(call gb_Trace_StartRange,templates/draw/$*.xml,XSL)
- $(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)/%.otg : \
- $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates/draw)/$$*/,\
- mimetype $$(call extras_DRAW_XMLFILES_RELATIVE,$$*))
- $(call gb_Output_announce,templates/draw/$*.otg,$(true),ZIP,2)
- $(call gb_Trace_StartRange,templates/draw/$*.otg,ZIP)
- $(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_DRAW_XMLFILES_RELATIVE,$*) \
- )
- $(call gb_Trace_EndRange,templates/draw/$*.otg,ZIP)
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_tplofficorr.mk
b/extras/CustomTarget_tplofficorr.mk
deleted file mode 100644
index 56a579d95dc3..000000000000
--- a/extras/CustomTarget_tplofficorr.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/officorr))
-
-extras_OFFICORR_XMLFILES := \
- Modern_business_letter_sans_serif/content.xml \
- Modern_business_letter_sans_serif/manifest.rdf \
- Modern_business_letter_sans_serif/META-INF/manifest.xml \
- Modern_business_letter_sans_serif/meta.xml \
- Modern_business_letter_sans_serif/styles.xml \
- Modern_business_letter_sans_serif/Thumbnails/thumbnail.png \
- Modern_business_letter_serif/content.xml \
- Modern_business_letter_serif/manifest.rdf \
- Modern_business_letter_serif/META-INF/manifest.xml \
- Modern_business_letter_serif/meta.xml \
- Modern_business_letter_serif/styles.xml \
- Modern_business_letter_serif/Thumbnails/thumbnail.png \
-
-# param: style-base (e.g. Modern)
-extras_OFFICORR_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_OFFICORR_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but
also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/% :
$(SRCDIR)/extras/source/templates/officorr/% \
- | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/officorr)/$$*).dir
- $(call gb_Output_announce,templates/officorr/$*,$(true),CPY,1)
- $(call gb_Trace_StartRange,templates/officorr/$*,CPY)
- cp $< $@
- $(call gb_Trace_EndRange,templates/officorr/$*,CPY)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.xml :
$(SRCDIR)/extras/source/templates/officorr/%.xml \
- | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/officorr)/$$*.xml).dir
- $(call gb_Output_announce,templates/officorr/$*.xml,$(true),XSL,1)
- $(call gb_Trace_StartRange,templates/officorr/$*.xml,XSL)
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $<
- $(call gb_Trace_EndRange,templates/officorr/$*.xml,XSL)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.ott : \
- $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates/officorr)/$$*/,\
- mimetype $$(call extras_OFFICORR_XMLFILES_RELATIVE,$$*))
- $(call gb_Output_announce,templates/officorr/$*.ott,$(true),ZIP,2)
- $(call gb_Trace_StartRange,templates/officorr/$*.ott,ZIP)
- $(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_OFFICORR_XMLFILES_RELATIVE,$*) \
- )
- $(call gb_Trace_EndRange,templates/officorr/$*.ott,ZIP)
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_tploffimisc.mk
b/extras/CustomTarget_tploffimisc.mk
deleted file mode 100644
index edf5a0657f39..000000000000
--- a/extras/CustomTarget_tploffimisc.mk
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/offimisc))
-
-extras_OFFIMISC_XMLFILES := \
- Businesscard-with-logo/content.xml \
- Businesscard-with-logo/manifest.rdf \
- Businesscard-with-logo/META-INF/manifest.xml \
- Businesscard-with-logo/meta.xml \
- Businesscard-with-logo/Pictures/10000201000001F4000000A0108F3F06.png \
- Businesscard-with-logo/settings.xml \
- Businesscard-with-logo/styles.xml \
- Businesscard-with-logo/Thumbnails/thumbnail.png \
-
-# param: style-base (e.g. Modern)
-extras_OFFIMISC_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_OFFIMISC_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but
also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/% :
$(SRCDIR)/extras/source/templates/offimisc/% \
- | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/$$*).dir
- $(call gb_Output_announce,templates/offimisc/$*,$(true),CPY,1)
- $(call gb_Trace_StartRange,templates/offimisc/$*,CPY)
- cp $< $@
- $(call gb_Trace_EndRange,templates/offimisc/$*,CPY)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.xml :
$(SRCDIR)/extras/source/templates/offimisc/%.xml \
- | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/$$*.xml).dir
- $(call gb_Output_announce,templates/offimisc/$*.xml,$(true),XSL,1)
- $(call gb_Trace_StartRange,templates/offimisc/$*.xml,XSL)
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $<
- $(call gb_Trace_EndRange,templates/offimisc/$*.xml,XSL)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.ott : \
- $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/$$*/,\
- mimetype $$(call extras_OFFIMISC_XMLFILES_RELATIVE,$$*))
- $(call gb_Output_announce,templates/offimisc/$*.ott,$(true),ZIP,2)
- $(call gb_Trace_StartRange,templates/offimisc/$*.ott,ZIP)
- $(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_OFFIMISC_XMLFILES_RELATIVE,$*) \
- )
- $(call gb_Trace_EndRange,templates/offimisc/$*.ott,ZIP)
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/CustomTarget_tplpersonal.mk
b/extras/CustomTarget_tplpersonal.mk
deleted file mode 100644
index b7d59b627b3a..000000000000
--- a/extras/CustomTarget_tplpersonal.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,extras/source/templates/personal))
-
-extras_PERSONAL_XMLFILES := \
- CV/content.xml \
- CV/manifest.rdf \
- CV/META-INF/manifest.xml \
- CV/meta.xml \
- CV/styles.xml \
- CV/Thumbnails/thumbnail.png \
- Resume1page/content.xml \
- Resume1page/manifest.rdf \
- Resume1page/META-INF/manifest.xml \
- Resume1page/meta.xml \
- Resume1page/styles.xml \
- Resume1page/Thumbnails/thumbnail.png \
-
-# param: style-base (e.g. Modern)
-extras_PERSONAL_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter
$(1)/%,$(extras_PERSONAL_XMLFILES)))
-
-.SECONDEXPANSION:
-# secondexpansion since the patterns not just cover a filename portion, but
also include a
-# directory portion withdifferent number of elements
-# copy regular files (mimetype, *.jpg, *.png, *.rdf, *.svg, *.svm, …)
-$(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/% :
$(SRCDIR)/extras/source/templates/personal/% \
- | $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/personal)/$$*).dir
- $(call gb_Output_announce,templates/personal/$*,$(true),CPY,1)
- $(call gb_Trace_StartRange,templates/personal/$*,CPY)
- cp $< $@
- $(call gb_Trace_EndRange,templates/personal/$*,CPY)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.xml :
$(SRCDIR)/extras/source/templates/personal/%.xml \
- | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \
- $$(dir $(call
gb_CustomTarget_get_workdir,extras/source/templates/personal)/$$*.xml).dir
- $(call gb_Output_announce,templates/personal/$*.xml,$(true),XSL,1)
- $(call gb_Trace_StartRange,templates/personal/$*.xml,XSL)
- $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@
$(SRCDIR)/extras/util/compact.xsl $<
- $(call gb_Trace_EndRange,templates/personal/$*.xml,XSL)
-
-$(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.ott : \
- $$(addprefix $(call
gb_CustomTarget_get_workdir,extras/source/templates/personal)/$$*/,\
- mimetype $$(call extras_PERSONAL_XMLFILES_RELATIVE,$$*))
- $(call gb_Output_announce,templates/personal/$*.ott,$(true),ZIP,2)
- $(call gb_Trace_StartRange,templates/personal/$*.ott,ZIP)
- $(call gb_Helper_abbreviate_dirs,\
- cd $(dir $<) && \
- zip -q0X --filesync --must-match $@ mimetype && \
- zip -qrX --must-match $@ $(call
extras_PERSONAL_XMLFILES_RELATIVE,$*) \
- )
- $(call gb_Trace_EndRange,templates/personal/$*.ott,ZIP)
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk
index 30c0d729cba1..fb4ca1d4a354 100644
--- a/extras/Module_extras.mk
+++ b/extras/Module_extras.mk
@@ -14,12 +14,8 @@ $(eval $(call gb_Module_add_targets,extras,\
CustomTarget_autotextuser \
CustomTarget_glade \
CustomTarget_gallsystem \
- CustomTarget_tplofficorr \
- CustomTarget_tploffimisc \
- CustomTarget_tplpersonal \
+ CustomTarget_templates \
CustomTarget_tplpresnt \
- CustomTarget_tpl_styles \
- CustomTarget_tpldraw \
CustomTarget_tplwizard \
Package_autocorr \
Package_autotextuser \
@@ -38,12 +34,8 @@ $(eval $(call gb_Module_add_targets,extras,\
Package_labels \
$(if $(filter WNT,$(OS)),Package_newfiles) \
Package_palettes \
- Package_tplofficorr \
- Package_tploffimisc \
- Package_tplpersonal \
+ Package_templates \
Package_tplpresnt \
- Package_tpl_styles \
- Package_tpldraw \
Package_tplwizard \
Package_tplwizbitmap \
Package_tplwizdesktop \
diff --git a/extras/Package_templates.mk b/extras/Package_templates.mk
new file mode 100644
index 000000000000..e618b646030d
--- /dev/null
+++ b/extras/Package_templates.mk
@@ -0,0 +1,24 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Package_Package,extras_templates,$(call
gb_CustomTarget_get_workdir,extras/source/templates)))
+
+$(eval $(call
gb_Package_add_files_with_dir,extras_templates,$(LIBO_SHARE_FOLDER)/template/common,\
+ officorr/Modern_business_letter_sans_serif.ott \
+ officorr/Modern_business_letter_serif.ott \
+ offimisc/Businesscard-with-logo.ott \
+ personal/CV.ott \
+ personal/Resume1page.ott \
+ styles/Default.ott \
+ styles/Modern.ott \
+ styles/Simple.ott \
+ draw/bpmn.otg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tpl_styles.mk b/extras/Package_tpl_styles.mk
deleted file mode 100644
index 13af8988c14b..000000000000
--- a/extras/Package_tpl_styles.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_tpl_styles,$(call
gb_CustomTarget_get_workdir,extras/source/templates/styles)))
-
-$(eval $(call
gb_Package_add_files,extras_tpl_styles,$(LIBO_SHARE_FOLDER)/template/common/styles,\
- Default.ott \
- Modern.ott \
- Simple.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tpldraw.mk b/extras/Package_tpldraw.mk
deleted file mode 100644
index 05f03deabc10..000000000000
--- a/extras/Package_tpldraw.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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.otg \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplofficorr.mk b/extras/Package_tplofficorr.mk
deleted file mode 100644
index 3b9242d06a85..000000000000
--- a/extras/Package_tplofficorr.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_tplofficorr,$(call
gb_CustomTarget_get_workdir,extras/source/templates/officorr)))
-
-$(eval $(call
gb_Package_add_files,extras_tplofficorr,$(LIBO_SHARE_FOLDER)/template/common/officorr,\
- Modern_business_letter_sans_serif.ott \
- Modern_business_letter_serif.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tploffimisc.mk b/extras/Package_tploffimisc.mk
deleted file mode 100644
index d0e834b6536d..000000000000
--- a/extras/Package_tploffimisc.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_tploffimisc,$(call
gb_CustomTarget_get_workdir,extras/source/templates/offimisc)))
-
-$(eval $(call
gb_Package_add_files,extras_tploffimisc,$(LIBO_SHARE_FOLDER)/template/common/offimisc,\
- Businesscard-with-logo.ott \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/extras/Package_tplpersonal.mk b/extras/Package_tplpersonal.mk
deleted file mode 100644
index 42a496631345..000000000000
--- a/extras/Package_tplpersonal.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,extras_tplpersonal,$(call
gb_CustomTarget_get_workdir,extras/source/templates/personal)))
-
-$(eval $(call
gb_Package_add_files,extras_tplpersonal,$(LIBO_SHARE_FOLDER)/template/common/personal,\
- CV.ott \
- Resume1page.ott \
-))
-
-# vim: set noet sw=4 ts=4:
