diff --git a/extras/CustomTarget_templates.mk b/extras/CustomTarget_templates.mk index b17ce37df9eb..9754985f1a59 100644 --- a/extras/CustomTarget_templates.mk +++ b/extras/CustomTarget_templates.mk @@ -9,40 +9,17 @@ $(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 \ - l10n/zh_CN_ott_normal/meta.xml \ - l10n/zh_CN_ott_normal/content.xml \ - l10n/ja_ott_normal/meta.xml \ - l10n/ja_ott_normal/content.xml \ +include $(SRCDIR)/extras/template_files.mk -# param: style-base (e.g. Modern) -extras_TEMPLATES_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_TEMPLATES_XMLFILES))) +define run_zip_template_recipe = +$(call gb_Output_announce,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),$(true),ZIP,2) +$(call gb_Trace_StartRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP) +cd $(dir $<) && \ +$(call gb_Helper_wsl_path,\ +$(WSL) zip -q0X --filesync --must-match $@ mimetype && \ +$(WSL) zip -qrX --must-match $@ $(subst $(dir $<),,$^)) +$(call gb_Trace_EndRange,$(subst $(gb_CustomTarget_workdir)/extras/source/,,$@),ZIP) +endef .SECONDEXPANSION: # secondexpansion since the patterns not just cover a filename portion, but also include a @@ -64,48 +41,22 @@ $(gb_CustomTarget_workdir)/extras/source/templates/%.xml : $(SRCDIR)/extras/sour $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_Trace_EndRange,templates/$*.xml,XSL) -# zip files to OTT +$(gb_CustomTarget_workdir)/extras/source/templates/%.odt \ +$(gb_CustomTarget_workdir)/extras/source/templates/%.otg \ +$(gb_CustomTarget_workdir)/extras/source/templates/%.oth \ +$(gb_CustomTarget_workdir)/extras/source/templates/%.otp \ +$(gb_CustomTarget_workdir)/extras/source/templates/%.ots \ $(gb_CustomTarget_workdir)/extras/source/templates/%.ott : \ $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_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 $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \ - $(WSL) zip -qrX --must-match $@ $(call extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/$*.ott,ZIP) + mimetype META-INF/manifest.xml content.xml meta.xml styles.xml \ + $$(call extra_files_TEMPLATES_RELATIVE,$$*)) + $(run_zip_template_recipe) -# zip files to OTG -$(gb_CustomTarget_workdir)/extras/source/templates/%.otg : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - mimetype $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - content.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - styles.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/$$*/,\ - META-INF/manifest.xml $$(call extras_TEMPLATES_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_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 $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \ - $(WSL) zip -qrX --must-match $@ $(call extras_TEMPLATES_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/$*.otg,ZIP) +# special case for styles/Default,Modern,Simple - no content.xml for those +$(gb_CustomTarget_workdir)/extras/source/templates/styles/%.ott : \ + $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/styles/$$*/,\ + mimetype META-INF/manifest.xml meta.xml styles.xml \ + $$(call extra_files_TEMPLATES_RELATIVE,styles/$$*)) + $(run_zip_template_recipe) # vim: set noet sw=4 ts=4: diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk deleted file mode 100644 index 6be2550b0098..000000000000 --- a/extras/CustomTarget_tplpresnt.mk +++ /dev/null @@ -1,143 +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/presnt)) - -# # for OTP 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_PRESENTATIONS_XMLFILES := \ - Beehive/meta.xml \ - Blue_Curve/meta.xml \ - Blueprint_Plans/meta.xml \ - Candy/meta.xml \ - DNA/meta.xml \ - Focus/meta.xml \ - Forestbird/meta.xml \ - Grey_Elegant/meta.xml \ - Growing_Liberty/meta.xml \ - Freshes/meta.xml \ - Inspiration/meta.xml \ - Lights/meta.xml \ - Metropolis/meta.xml \ - Midnightblue/meta.xml \ - Nature_Illustration/meta.xml \ - Pencil/meta.xml \ - Piano/meta.xml \ - Portfolio/meta.xml \ - Progress/meta.xml \ - Sunset/meta.xml \ - Vintage/meta.xml \ - Vivid/meta.xml \ - Yellow_Idea/meta.xml \ - Freshes/Object_1/content.xml \ - Freshes/Object_2/content.xml \ - Blueprint_Plans/Pictures/10000000000000580000001F99D2A38C014B254B.png \ - Blueprint_Plans/Pictures/100000000000033C0000026D847ACE982C6E20B6.png \ - Blueprint_Plans/Pictures/10000000000004220000031A5C2E04AB7C51FB60.png \ - Blueprint_Plans/Pictures/1000020100000500000002D03918081590A75FCF.png \ - Blueprint_Plans/Pictures/1000020100000500000002D0F25E20EA381A5EBD.png \ - Candy/Pictures/10000000000004A800000500DD5BB9FFED422172.png \ - Candy/Pictures/10000000000005000000050014DEA376B6E67205.png \ - Candy/Pictures/1000000000000780000004383B6CE268A9802A07.png \ - Candy/Pictures/10000000000007800000043870026B1FACED0D1B.png \ - Freshes/Pictures/10000000000001980000067FB46981E5FBCD5A53.jpg \ - Freshes/Pictures/10000000000002C5000003C02FC12A07C25F42DF.jpg \ - Freshes/Pictures/10000000000002D50000067FACCA26111F046EB5.jpg \ - Freshes/Pictures/100000000000030F0000036F55A62FC34FCAB38E.jpg \ - Freshes/Pictures/100000000000049100000359E7B1AC100BA62FBB.jpg \ - Freshes/Pictures/10000000000006D7000003A637B7BBC50EDF4D24.jpg \ - Freshes/Pictures/1000000000000B8B0000067F7C4C059ECC323C6F.jpg \ - Grey_Elegant/Pictures/1000000000000007000000075D9D31963C8C0E25.jpg \ - Grey_Elegant/Pictures/1000000000000007000000076677E5BE1EDAF335.jpg \ - Grey_Elegant/Pictures/10000000000001920000019230489F7A89351262.jpg \ - Grey_Elegant/Pictures/10000109000002950000029599843C084F54196C.svg \ - Grey_Elegant/Pictures/100001E0000002950000029531405702AAD800D0.svg \ - Grey_Elegant/Pictures/10000201000000190000001945D72F17575B71B4.png \ - Grey_Elegant/Pictures/1000020100000019000000194F0EE08BB7018624.png \ - Grey_Elegant/Pictures/10000201000000190000001967D610D5BD5B9486.png \ - Grey_Elegant/Pictures/100002010000001900000019B19ADF33FD67D860.png \ - Grey_Elegant/Pictures/100002010000001900000019CA03B954885E470D.png \ - Grey_Elegant/Pictures/10000201000003300000026455AC9786240DB2F8.png \ - Grey_Elegant/Pictures/100002510000029500000295D9236A158400ED63.svg \ - Grey_Elegant/Pictures/100002800000029500000295458C6106AED5C839.svg \ - Grey_Elegant/Pictures/100002CA0000029500000295A190AE1D987B676B.svg \ - Grey_Elegant/Pictures/1000DC810000A57800007C20AABC768B7E7ACB30.svg \ - Growing_Liberty/Pictures/10000000000007800000043801760C0AF0E62E0B.jpg \ - Growing_Liberty/Pictures/10000000000007800000043827B5F54D1F4F498F.jpg \ - Growing_Liberty/Pictures/100002010000016A0000029374C9F2B8F26392AD.png \ - Growing_Liberty/Pictures/10000201000001F000000351DA39462E363D7ED3.png \ - Growing_Liberty/Pictures/10000201000001F10000029333ED1BC48076B5C4.png \ - Growing_Liberty/Pictures/10000201000001F3000003548E51808DE171DA02.png \ - Growing_Liberty/Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg \ - Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg \ - Growing_Liberty/Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg \ - Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg \ - Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png \ - Metropolis/Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg \ - Nature_Illustration/Pictures/10000000000004210000031931EA92AB7FB2FD6C.jpg \ - Nature_Illustration/Pictures/100000000000042100000319892187DC121460D8.jpg \ - Pencil/Pictures/1000020100000088000000870A26C51C993940C3.png \ - Pencil/Pictures/100002010000037D0000001C2F14EFE8274AD9FC.png \ - Pencil/Pictures/1000020100000402000000A2F7F509AE74DE6C69.png \ - Piano/Pictures/100000000000035400000120266623530F1969D0.png \ - Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png \ - Vintage/Pictures/10000000000000580000001F99D2A38C014B254B.png \ - Vintage/Pictures/10000201000004B000000337490AE22881331C9B.png \ - Vintage/Pictures/10000201000004B00000033776CA70A4BFE2196B.png \ - Vintage/Pictures/10000201000004B0000003379D1127938561C230.png \ - Vintage/Pictures/10000201000004B000000337D99A2303560BD59C.png \ - -# param: style-base (e.g. Modern) -extras_PRESNT_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_PRESENTATIONS_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, …) -$(gb_CustomTarget_workdir)/extras/source/templates/presnt/% : $(SRCDIR)/extras/source/templates/presnt/% \ - | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*).dir - $(call gb_Output_announce,templates/presnt/$*,$(true),CPY,1) - $(call gb_Trace_StartRange,templates/presnt/$*,CPY) - cp $< $@ - $(call gb_Trace_EndRange,templates/presnt/$*,CPY) - -# test and copy xml files -$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \ - $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*.xml).dir - $(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1) - $(call gb_Trace_StartRange,templates/presnt/$*.xml,XSL) - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< - $(call gb_Trace_EndRange,templates/presnt/$*.xml,XSL) - -# zip files to OTP -$(gb_CustomTarget_workdir)/extras/source/templates/presnt/%.otp : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\ - mimetype $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\ - content.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\ - styles.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\ - META-INF/manifest.xml $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/presnt/$$*/,\ - Thumbnails/thumbnail.png $$(call extras_PRESNT_XMLFILES_RELATIVE,$$*) ) - $(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/presnt/$*.otp,ZIP) - $(call gb_Helper_abbreviate_dirs,\ - cd $(dir $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml styles.xml META-INF/manifest.xml Thumbnails/thumbnail.png && \ - $(WSL) zip -qrX --must-match $@ $(call extras_PRESNT_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/presnt/$*.otp,ZIP) - -# vim: set noet sw=4 ts=4: diff --git a/extras/CustomTarget_tplwizard.mk b/extras/CustomTarget_tplwizard.mk deleted file mode 100644 index 3e54d0b5e99c..000000000000 --- a/extras/CustomTarget_tplwizard.mk +++ /dev/null @@ -1,241 +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/wizard)) - -# mimetype, content.xml, settings.xml, styles.xml and META-INF/manifest.xml -# files are automatically added for each template -# list of meta.xml files (one per template) + other files (manifest.rdf, pictures...) -extras_WIZARD_XMLFILES := \ - agenda/10grey/meta.xml \ - agenda/1simple/meta.xml \ - agenda/2elegant/meta.xml \ - agenda/3modern/meta.xml \ - agenda/4classic/meta.xml \ - agenda/5blue/meta.xml \ - agenda/6orange/meta.xml \ - agenda/7red/meta.xml \ - agenda/8green/meta.xml \ - agenda/9colorful/meta.xml \ - agenda/aw-10grey/meta.xml \ - agenda/aw-1simple/meta.xml \ - agenda/aw-2elegant/meta.xml \ - agenda/aw-3modern/meta.xml \ - agenda/aw-4classic/meta.xml \ - agenda/aw-5blue/meta.xml \ - agenda/aw-6orange/meta.xml \ - agenda/aw-7red/meta.xml \ - agenda/aw-8green/meta.xml \ - agenda/aw-9colorful/meta.xml \ - agenda/10grey/manifest.rdf \ - agenda/1simple/manifest.rdf \ - agenda/2elegant/manifest.rdf \ - agenda/3modern/manifest.rdf \ - agenda/4classic/manifest.rdf \ - agenda/5blue/manifest.rdf \ - agenda/6orange/manifest.rdf \ - agenda/7red/manifest.rdf \ - agenda/8green/manifest.rdf \ - agenda/9colorful/manifest.rdf \ - agenda/aw-10grey/manifest.rdf \ - agenda/aw-1simple/manifest.rdf \ - agenda/aw-2elegant/manifest.rdf \ - agenda/aw-3modern/manifest.rdf \ - agenda/aw-4classic/manifest.rdf \ - agenda/aw-5blue/manifest.rdf \ - agenda/aw-6orange/manifest.rdf \ - agenda/aw-7red/manifest.rdf \ - agenda/aw-8green/manifest.rdf \ - agenda/aw-9colorful/manifest.rdf \ - agenda/2elegant/Pictures/1000000000000280000000052876A81A.gif \ - agenda/2elegant/Pictures/100002000000008F0000000A83659D51.gif \ - agenda/aw-2elegant/Pictures/1000000000000280000000052876A81A.gif \ - agenda/aw-2elegant/Pictures/100002000000008F0000000A83659D51.gif \ - fax/bus-classic_f/meta.xml \ - fax/bus-classic-pri_f/meta.xml \ - fax/bus-modern_f/meta.xml \ - fax/bus-modern-pri_f/meta.xml \ - fax/pri-bottle_f/meta.xml \ - fax/pri-fax_f/meta.xml \ - fax/pri-lines_f/meta.xml \ - fax/pri-marine_f/meta.xml \ - fax/bus-classic_f/manifest.rdf \ - fax/bus-classic-pri_f/manifest.rdf \ - fax/bus-modern_f/manifest.rdf \ - fax/bus-modern-pri_f/manifest.rdf \ - fax/bus-classic_f/Pictures/200000520000271100001F73A977C564.wmf \ - fax/bus-modern_f/Pictures/2000004E0000271100001F73772F7F48.wmf \ - fax/pri-bottle_f/Pictures/200002EB000022DA000024E1F891208C.wmf \ - fax/pri-fax_f/Pictures/2000032600002711000026A54A905481.wmf \ - fax/pri-marine_f/Pictures/2000004B0000227F0000227886F3FC0F.wmf \ - letter/bus-elegant_l/meta.xml \ - letter/bus-modern_l/meta.xml \ - letter/bus-office_l/meta.xml \ - letter/off-elegant_l/meta.xml \ - letter/off-modern_l/meta.xml \ - letter/off-office_l/meta.xml \ - letter/pri-bottle_l/meta.xml \ - letter/pri-mail_l/meta.xml \ - letter/pri-marine_l/meta.xml \ - letter/pri-redline_l/meta.xml \ - letter/bus-elegant_l/manifest.rdf \ - letter/bus-modern_l/manifest.rdf \ - letter/bus-office_l/manifest.rdf \ - letter/off-elegant_l/manifest.rdf \ - letter/off-modern_l/manifest.rdf \ - letter/off-office_l/manifest.rdf \ - letter/bus-elegant_l/Pictures/10000000000001B8000000824B7EA208.png \ - letter/bus-modern_l/Pictures/10000000000001B8000000824B7EA208.png \ - letter/bus-office_l/Pictures/10000000000001B8000000824B7EA208.png \ - letter/off-elegant_l/Pictures/2000000D00000434000006FD6841386B.svm \ - letter/off-modern_l/Pictures/10000000000000110000001142D1547F.png \ - letter/pri-bottle_l/Pictures/200002EB000022DA000024E1F891208C.wmf \ - letter/pri-mail_l/Pictures/200000430000271100001205CAE80946.wmf \ - letter/pri-marine_l/Pictures/2000004B0000227F0000227886F3FC0F.wmf \ - report/cnt-01/meta.xml \ - report/cnt-011/meta.xml \ - report/cnt-012/meta.xml \ - report/cnt-02/meta.xml \ - report/cnt-021/meta.xml \ - report/cnt-022/meta.xml \ - report/cnt-03/meta.xml \ - report/cnt-031/meta.xml \ - report/cnt-032/meta.xml \ - report/cnt-04/meta.xml \ - report/cnt-041/meta.xml \ - report/cnt-042/meta.xml \ - report/cnt-05/meta.xml \ - report/cnt-051/meta.xml \ - report/cnt-052/meta.xml \ - report/cnt-06/meta.xml \ - report/cnt-061/meta.xml \ - report/cnt-062/meta.xml \ - report/cnt-default/meta.xml \ - report/stl-01/meta.xml \ - report/stl-02/meta.xml \ - report/stl-03/meta.xml \ - report/stl-04/meta.xml \ - report/stl-05/meta.xml \ - report/stl-06/meta.xml \ - report/stl-07/meta.xml \ - report/stl-08/meta.xml \ - report/stl-09/meta.xml \ - report/stl-default/meta.xml \ - report/stl-01/manifest.rdf \ - report/stl-02/manifest.rdf \ - report/stl-03/manifest.rdf \ - report/stl-04/manifest.rdf \ - report/stl-05/manifest.rdf \ - report/stl-06/manifest.rdf \ - report/stl-07/manifest.rdf \ - report/stl-08/manifest.rdf \ - report/stl-09/manifest.rdf \ - report/stl-default/manifest.rdf \ - report/stl-01/Pictures/100002000000001400000014E87B6AC5.gif \ - report/stl-01/Pictures/2000018100001CB100002711BFED37A8.wmf \ - report/stl-02/Pictures/2000009E0000380100002657BA019D86.wmf \ - report/stl-03/Pictures/2000024900002711000021F4DCB2DF4A.wmf \ - report/stl-04/Pictures/10000000000000400000004077CDC8F9.png \ - report/stl-04/Pictures/10000000000001C6000000E44DCA6C94.jpg \ - report/stl-05/Pictures/2000036D000027110000145EB7E93049.wmf \ - report/stl-06/Pictures/100000000000005A000000268DE98CCE.gif \ - report/stl-06/Pictures/100000000000021B000001E8BE936AB6.gif \ - report/stl-08/Pictures/100000000000005E0000005E97FB9EF6.jpg \ - report/stl-09/Pictures/10000000000000050000004D32652675.jpg \ - report/stl-09/Pictures/100002000000001400000014E87B6AC5.gif \ - report/stl-09/Pictures/2000025100001D92000017719EB70CFB.wmf \ - styles/black_white/meta.xml \ - styles/blackberry/meta.xml \ - styles/default/meta.xml \ - styles/diner/meta.xml \ - styles/fall/meta.xml \ - styles/glacier/meta.xml \ - styles/green_grapes/meta.xml \ - styles/jeans/meta.xml \ - styles/marine/meta.xml \ - styles/millennium/meta.xml \ - styles/nature/meta.xml \ - styles/neon/meta.xml \ - styles/night/meta.xml \ - styles/nostalgic/meta.xml \ - styles/pastell/meta.xml \ - styles/pool/meta.xml \ - styles/pumpkin/meta.xml \ - styles/xos/meta.xml \ - -# param: style-base (e.g. agenda/10grey) -extras_WIZARD_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZARD_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, …) -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \ - | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir - $(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1) - $(call gb_Trace_StartRange,templates/wizard/$*,CPY) - cp $< $@ - $(call gb_Trace_EndRange,templates/wizard/$*,CPY) - -# test and copy xml files -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \ - $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir - $(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1) - $(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL) - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< - $(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL) - -# zip files to OTT -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ott : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) - $(call gb_Output_announce,templates/wizard/$*.ott,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/wizard/$*.ott,ZIP) - $(call gb_Helper_abbreviate_dirs,\ - cd $(dir $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \ - $(WSL) zip -qrX --must-match $@ $(call extras_WIZARD_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/wizard/$*.ott,ZIP) - -# zip files to OTS -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.ots : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - mimetype $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - content.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - settings.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - styles.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - META-INF/manifest.xml $$(call extras_WIZARD_XMLFILES_RELATIVE,$$*) ) - $(call gb_Output_announce,templates/wizard/$*.ots,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/wizard/$*.ots,ZIP) - $(call gb_Helper_abbreviate_dirs,\ - cd $(dir $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \ - $(WSL) zip -qrX --must-match $@ $(call extras_WIZARD_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/wizard/$*.ots,ZIP) - -# vim: set noet sw=4 ts=4: diff --git a/extras/CustomTarget_tplwizdesktop.mk b/extras/CustomTarget_tplwizdesktop.mk deleted file mode 100644 index cb51cf5400ca..000000000000 --- a/extras/CustomTarget_tplwizdesktop.mk +++ /dev/null @@ -1,89 +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/wizard)) - -# mimetype, content.xml, meta.xml, styles.xml and META-INF/manifest.xml -# files are automatically added for each template -# list of meta.xml files (one per template) + other files (manifest.rdf, pictures...) -extras_WIZDESKTOP_XMLFILES := \ - desktop/html/meta.xml \ - desktop/idxexample/meta.xml \ - desktop/idxexample/Pictures/2000008600001923000012C24E0D0895.wmf \ - -# param: style-base (e.g. agenda/10grey) -extras_WIZDESKTOP_XMLFILES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extras_WIZDESKTOP_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, …) -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/% : $(SRCDIR)/extras/source/templates/wizard/% \ - | $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*).dir - $(call gb_Output_announce,templates/wizard/$*,$(true),CPY,1) - $(call gb_Trace_StartRange,templates/wizard/$*,CPY) - cp $< $@ - $(call gb_Trace_EndRange,templates/wizard/$*,CPY) - -# test and copy xml files -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.xml : $(SRCDIR)/extras/source/templates/wizard/%.xml \ - | $(call gb_ExternalExecutable_get_dependencies,xsltproc) \ - $$(dir $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*.xml).dir - $(call gb_Output_announce,templates/wizard/$*.xml,$(true),XSL,1) - $(call gb_Trace_StartRange,templates/wizard/$*.xml,XSL) - $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< - $(call gb_Trace_EndRange,templates/wizard/$*.xml,XSL) - -# zip files to OTH -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.oth : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - mimetype $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - content.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - styles.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - settings.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - META-INF/manifest.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) - $(call gb_Output_announce,templates/wizard/$*.oth,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/wizard/$*.oth,ZIP) - $(call gb_Helper_abbreviate_dirs,\ - cd $(dir $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \ - $(WSL) zip -qrX --must-match $@ $(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/wizard/$*.oth,ZIP) - -# zip files to ODT -$(gb_CustomTarget_workdir)/extras/source/templates/wizard/%.odt : \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - mimetype $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - content.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - settings.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - styles.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) \ - $$(addprefix $(gb_CustomTarget_workdir)/extras/source/templates/wizard/$$*/,\ - META-INF/manifest.xml $$(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$$*) ) - $(call gb_Output_announce,templates/wizard/$*.odt,$(true),ZIP,2) - $(call gb_Trace_StartRange,templates/wizard/$*.odt,ZIP) - $(call gb_Helper_abbreviate_dirs,\ - cd $(dir $<) && \ - $(call gb_Helper_wsl_path,\ - $(WSL) zip -q0X --filesync --must-match $@ mimetype && \ - $(WSL) zip -qrX --must-match $@ content.xml settings.xml styles.xml META-INF/manifest.xml && \ - $(WSL) zip -qrX --must-match $@ $(call extras_WIZDESKTOP_XMLFILES_RELATIVE,$*)) \ - ) - $(call gb_Trace_EndRange,templates/wizard/$*.odt,ZIP) - -# vim: set noet sw=4 ts=4: diff --git a/extras/Module_extras.mk b/extras/Module_extras.mk index 38632ca5b2a3..0c04202e8a20 100644 --- a/extras/Module_extras.mk +++ b/extras/Module_extras.mk @@ -15,9 +15,6 @@ $(eval $(call gb_Module_add_targets,extras,\ CustomTarget_glade \ CustomTarget_gallsystem \ CustomTarget_templates \ - CustomTarget_tplpresnt \ - CustomTarget_tplwizard \ - CustomTarget_tplwizdesktop \ Package_autocorr \ Package_autotextuser \ Package_cfgsrvnolang \ diff --git a/extras/README.md b/extras/README.md index 4c5fbdd2da2b..11a4ee3ef160 100644 --- a/extras/README.md +++ b/extras/README.md @@ -35,8 +35,8 @@ Contains templates, clipart galleries, palettes, symbol font, autocorrections, a + choose a template category `` + unzip `Foo.ot?` (? = p, t, s or g) in `extras/source/templates//Foo` (no space allowed in any file names) + add `/Foo.ot? /` in `Package_templates.mk` (or `Package_tplpresnt.mk` if it's a presentation) - + in `CustomTarget_templates.mk` (or `CustomTarget_tplpresnt.mk` if it's a presentation): - + add `/Foo/meta.xml /` and all files which are not automatically added in `extras_TEMPLATES_XMLFILES` (or `extras_PRESENTATIONS_XMLFILES` for presentation) + + in `template_files.mk`: + + add e.g. `/Foo/settings.xml` (and all other files which are not automatically added) to `extra_files_COMMON` (or `extra_files_PRESENTATIONS` in case of a presentation template) + for translation of template name + define a new STR_TEMPLATE_NAMExx in include/sfx2/strings.hrc + define a new STR_TEMPLATE_NAMExx_DEF in sfx2/inc/strings.hxx diff --git a/extras/template_files.mk b/extras/template_files.mk new file mode 100644 index 000000000000..57e006f6e774 --- /dev/null +++ b/extras/template_files.mk @@ -0,0 +1,307 @@ +# -*- 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/. +# + +# this file lists the contents/parts that make up the individual templates that are created during +# the build. +# +# The Package_*.mk files list the files that should be built and delivered to the installation tree, +# and CustomTarget_templates.mk has the actual recipes to assemble and package the template files. +# +# The split used here follows the split from the Package_*mk files, but that split is arbitrary/ +# artificial, they are ultimately combined into a single variable. +# A split only matters on the Package level, but even there only the wizard/desktop files are +# "special" (they are always created/packaged, while the rests is optional/behind a WITH_TEMPLATES +# conditional) + +# Specify filenames relative to SRC_ROOT/extras/source/templates +# mimetype, META-INF/manifest.xml, content.xml, meta.xml and styles.xml are always assumed to be +# present and can be omitted + +extra_files_COMMON := \ + draw/bpmn/Thumbnails/thumbnail.png \ + l10n/ja_ott_normal/manifest.rdf \ + l10n/ja_ott_normal/settings.xml \ + l10n/ja_ott_normal/Thumbnails/thumbnail.png \ + l10n/zh_CN_ott_normal/Thumbnails/thumbnail.png \ + officorr/Modern_business_letter_sans_serif/manifest.rdf \ + officorr/Modern_business_letter_sans_serif/Thumbnails/thumbnail.png \ + officorr/Modern_business_letter_serif/manifest.rdf \ + officorr/Modern_business_letter_serif/Thumbnails/thumbnail.png \ + offimisc/Businesscard-with-logo/manifest.rdf \ + offimisc/Businesscard-with-logo/Pictures/10000201000001F4000000A0108F3F06.png \ + offimisc/Businesscard-with-logo/settings.xml \ + offimisc/Businesscard-with-logo/Thumbnails/thumbnail.png \ + personal/CV/manifest.rdf \ + personal/CV/Thumbnails/thumbnail.png \ + personal/Resume1page/manifest.rdf \ + personal/Resume1page/Thumbnails/thumbnail.png \ + styles/Default/Thumbnails/thumbnail.png \ + styles/Modern/Thumbnails/thumbnail.png \ + styles/Simple/Thumbnails/thumbnail.png \ + + +extra_files_PRESENTATIONS := \ + presnt/Beehive/Thumbnails/thumbnail.png \ + presnt/Blue_Curve/Thumbnails/thumbnail.png \ + presnt/Blueprint_Plans/Pictures/10000000000000580000001F99D2A38C014B254B.png \ + presnt/Blueprint_Plans/Pictures/100000000000033C0000026D847ACE982C6E20B6.png \ + presnt/Blueprint_Plans/Pictures/10000000000004220000031A5C2E04AB7C51FB60.png \ + presnt/Blueprint_Plans/Pictures/1000020100000500000002D03918081590A75FCF.png \ + presnt/Blueprint_Plans/Pictures/1000020100000500000002D0F25E20EA381A5EBD.png \ + presnt/Blueprint_Plans/Thumbnails/thumbnail.png \ + presnt/Candy/Pictures/10000000000004A800000500DD5BB9FFED422172.png \ + presnt/Candy/Pictures/10000000000005000000050014DEA376B6E67205.png \ + presnt/Candy/Pictures/1000000000000780000004383B6CE268A9802A07.png \ + presnt/Candy/Pictures/10000000000007800000043870026B1FACED0D1B.png \ + presnt/Candy/Thumbnails/thumbnail.png \ + presnt/DNA/Thumbnails/thumbnail.png \ + presnt/Focus/Thumbnails/thumbnail.png \ + presnt/Forestbird/Thumbnails/thumbnail.png \ + presnt/Freshes/Object_1/content.xml \ + presnt/Freshes/Object_2/content.xml \ + presnt/Freshes/Pictures/10000000000001980000067FB46981E5FBCD5A53.jpg \ + presnt/Freshes/Pictures/10000000000002C5000003C02FC12A07C25F42DF.jpg \ + presnt/Freshes/Pictures/10000000000002D50000067FACCA26111F046EB5.jpg \ + presnt/Freshes/Pictures/100000000000030F0000036F55A62FC34FCAB38E.jpg \ + presnt/Freshes/Pictures/100000000000049100000359E7B1AC100BA62FBB.jpg \ + presnt/Freshes/Pictures/10000000000006D7000003A637B7BBC50EDF4D24.jpg \ + presnt/Freshes/Pictures/1000000000000B8B0000067F7C4C059ECC323C6F.jpg \ + presnt/Freshes/Thumbnails/thumbnail.png \ + presnt/Grey_Elegant/Pictures/1000000000000007000000075D9D31963C8C0E25.jpg \ + presnt/Grey_Elegant/Pictures/1000000000000007000000076677E5BE1EDAF335.jpg \ + presnt/Grey_Elegant/Pictures/10000000000001920000019230489F7A89351262.jpg \ + presnt/Grey_Elegant/Pictures/10000109000002950000029599843C084F54196C.svg \ + presnt/Grey_Elegant/Pictures/100001E0000002950000029531405702AAD800D0.svg \ + presnt/Grey_Elegant/Pictures/10000201000000190000001945D72F17575B71B4.png \ + presnt/Grey_Elegant/Pictures/1000020100000019000000194F0EE08BB7018624.png \ + presnt/Grey_Elegant/Pictures/10000201000000190000001967D610D5BD5B9486.png \ + presnt/Grey_Elegant/Pictures/100002010000001900000019B19ADF33FD67D860.png \ + presnt/Grey_Elegant/Pictures/100002010000001900000019CA03B954885E470D.png \ + presnt/Grey_Elegant/Pictures/10000201000003300000026455AC9786240DB2F8.png \ + presnt/Grey_Elegant/Pictures/100002510000029500000295D9236A158400ED63.svg \ + presnt/Grey_Elegant/Pictures/100002800000029500000295458C6106AED5C839.svg \ + presnt/Grey_Elegant/Pictures/100002CA0000029500000295A190AE1D987B676B.svg \ + presnt/Grey_Elegant/Pictures/1000DC810000A57800007C20AABC768B7E7ACB30.svg \ + presnt/Grey_Elegant/Thumbnails/thumbnail.png \ + presnt/Growing_Liberty/Pictures/10000000000007800000043801760C0AF0E62E0B.jpg \ + presnt/Growing_Liberty/Pictures/10000000000007800000043827B5F54D1F4F498F.jpg \ + presnt/Growing_Liberty/Pictures/100002010000016A0000029374C9F2B8F26392AD.png \ + presnt/Growing_Liberty/Pictures/10000201000001F000000351DA39462E363D7ED3.png \ + presnt/Growing_Liberty/Pictures/10000201000001F10000029333ED1BC48076B5C4.png \ + presnt/Growing_Liberty/Pictures/10000201000001F3000003548E51808DE171DA02.png \ + presnt/Growing_Liberty/Pictures/10000C1C0000034200004A6A2C92F38BC117DD3C.svg \ + presnt/Growing_Liberty/Pictures/10000C340000844B000003422549B923A55839CC.svg \ + presnt/Growing_Liberty/Pictures/10000C8F0000034200004A6ABD021DA9BD39254C.svg \ + presnt/Growing_Liberty/Pictures/10000CA90000844B000003426738F0E80CCFF9F3.svg \ + presnt/Growing_Liberty/Thumbnails/thumbnail.png \ + presnt/Inspiration/Thumbnails/thumbnail.png \ + presnt/Lights/Thumbnails/thumbnail.png \ + presnt/Metropolis/Pictures/10000201000003AF000002126A94207C4902B60B.png \ + presnt/Metropolis/Pictures/100021B200008D2E00004F60B312A649B9EEC188.svg \ + presnt/Metropolis/Thumbnails/thumbnail.png \ + presnt/Midnightblue/Thumbnails/thumbnail.png \ + presnt/Nature_Illustration/Pictures/10000000000004210000031931EA92AB7FB2FD6C.jpg \ + presnt/Nature_Illustration/Pictures/100000000000042100000319892187DC121460D8.jpg \ + presnt/Nature_Illustration/Thumbnails/thumbnail.png \ + presnt/Pencil/Pictures/1000020100000088000000870A26C51C993940C3.png \ + presnt/Pencil/Pictures/100002010000037D0000001C2F14EFE8274AD9FC.png \ + presnt/Pencil/Pictures/1000020100000402000000A2F7F509AE74DE6C69.png \ + presnt/Pencil/Thumbnails/thumbnail.png \ + presnt/Piano/Pictures/100000000000035400000120266623530F1969D0.png \ + presnt/Piano/Pictures/100002010000033A0000006EDD62437E1CC42053.png \ + presnt/Piano/Thumbnails/thumbnail.png \ + presnt/Portfolio/Thumbnails/thumbnail.png \ + presnt/Progress/Thumbnails/thumbnail.png \ + presnt/Sunset/Thumbnails/thumbnail.png \ + presnt/Vintage/Pictures/10000000000000580000001F99D2A38C014B254B.png \ + presnt/Vintage/Pictures/10000201000004B000000337490AE22881331C9B.png \ + presnt/Vintage/Pictures/10000201000004B00000033776CA70A4BFE2196B.png \ + presnt/Vintage/Pictures/10000201000004B0000003379D1127938561C230.png \ + presnt/Vintage/Pictures/10000201000004B000000337D99A2303560BD59C.png \ + presnt/Vintage/Thumbnails/thumbnail.png \ + presnt/Vivid/Thumbnails/thumbnail.png \ + presnt/Yellow_Idea/Thumbnails/thumbnail.png \ + + +extra_files_WIZARD := \ + wizard/agenda/10grey/manifest.rdf \ + wizard/agenda/10grey/settings.xml \ + wizard/agenda/1simple/manifest.rdf \ + wizard/agenda/1simple/settings.xml \ + wizard/agenda/2elegant/manifest.rdf \ + wizard/agenda/2elegant/Pictures/1000000000000280000000052876A81A.gif \ + wizard/agenda/2elegant/Pictures/100002000000008F0000000A83659D51.gif \ + wizard/agenda/2elegant/settings.xml \ + wizard/agenda/3modern/manifest.rdf \ + wizard/agenda/3modern/settings.xml \ + wizard/agenda/4classic/manifest.rdf \ + wizard/agenda/4classic/settings.xml \ + wizard/agenda/5blue/manifest.rdf \ + wizard/agenda/5blue/settings.xml \ + wizard/agenda/6orange/manifest.rdf \ + wizard/agenda/6orange/settings.xml \ + wizard/agenda/7red/manifest.rdf \ + wizard/agenda/7red/settings.xml \ + wizard/agenda/8green/manifest.rdf \ + wizard/agenda/8green/settings.xml \ + wizard/agenda/9colorful/manifest.rdf \ + wizard/agenda/9colorful/settings.xml \ + wizard/agenda/aw-10grey/manifest.rdf \ + wizard/agenda/aw-10grey/settings.xml \ + wizard/agenda/aw-1simple/manifest.rdf \ + wizard/agenda/aw-1simple/settings.xml \ + wizard/agenda/aw-2elegant/manifest.rdf \ + wizard/agenda/aw-2elegant/Pictures/1000000000000280000000052876A81A.gif \ + wizard/agenda/aw-2elegant/Pictures/100002000000008F0000000A83659D51.gif \ + wizard/agenda/aw-2elegant/settings.xml \ + wizard/agenda/aw-3modern/manifest.rdf \ + wizard/agenda/aw-3modern/settings.xml \ + wizard/agenda/aw-4classic/manifest.rdf \ + wizard/agenda/aw-4classic/settings.xml \ + wizard/agenda/aw-5blue/manifest.rdf \ + wizard/agenda/aw-5blue/settings.xml \ + wizard/agenda/aw-6orange/manifest.rdf \ + wizard/agenda/aw-6orange/settings.xml \ + wizard/agenda/aw-7red/manifest.rdf \ + wizard/agenda/aw-7red/settings.xml \ + wizard/agenda/aw-8green/manifest.rdf \ + wizard/agenda/aw-8green/settings.xml \ + wizard/agenda/aw-9colorful/manifest.rdf \ + wizard/agenda/aw-9colorful/settings.xml \ + wizard/desktop/html/settings.xml \ + wizard/desktop/idxexample/settings.xml \ + wizard/fax/bus-classic_f/manifest.rdf \ + wizard/fax/bus-classic_f/Pictures/200000520000271100001F73A977C564.wmf \ + wizard/fax/bus-classic_f/settings.xml \ + wizard/fax/bus-classic-pri_f/manifest.rdf \ + wizard/fax/bus-classic-pri_f/settings.xml \ + wizard/fax/bus-modern_f/manifest.rdf \ + wizard/fax/bus-modern_f/Pictures/2000004E0000271100001F73772F7F48.wmf \ + wizard/fax/bus-modern_f/settings.xml \ + wizard/fax/bus-modern-pri_f/manifest.rdf \ + wizard/fax/bus-modern-pri_f/settings.xml \ + wizard/fax/pri-bottle_f/Pictures/200002EB000022DA000024E1F891208C.wmf \ + wizard/fax/pri-bottle_f/settings.xml \ + wizard/fax/pri-fax_f/Pictures/2000032600002711000026A54A905481.wmf \ + wizard/fax/pri-fax_f/settings.xml \ + wizard/fax/pri-lines_f/settings.xml \ + wizard/fax/pri-marine_f/Pictures/2000004B0000227F0000227886F3FC0F.wmf \ + wizard/fax/pri-marine_f/settings.xml \ + wizard/letter/bus-elegant_l/manifest.rdf \ + wizard/letter/bus-elegant_l/Pictures/10000000000001B8000000824B7EA208.png \ + wizard/letter/bus-elegant_l/settings.xml \ + wizard/letter/bus-modern_l/manifest.rdf \ + wizard/letter/bus-modern_l/Pictures/10000000000001B8000000824B7EA208.png \ + wizard/letter/bus-modern_l/settings.xml \ + wizard/letter/bus-office_l/manifest.rdf \ + wizard/letter/bus-office_l/Pictures/10000000000001B8000000824B7EA208.png \ + wizard/letter/bus-office_l/settings.xml \ + wizard/letter/off-elegant_l/manifest.rdf \ + wizard/letter/off-elegant_l/Pictures/2000000D00000434000006FD6841386B.svm \ + wizard/letter/off-elegant_l/settings.xml \ + wizard/letter/off-modern_l/manifest.rdf \ + wizard/letter/off-modern_l/Pictures/10000000000000110000001142D1547F.png \ + wizard/letter/off-modern_l/settings.xml \ + wizard/letter/off-office_l/manifest.rdf \ + wizard/letter/off-office_l/settings.xml \ + wizard/letter/pri-bottle_l/Pictures/200002EB000022DA000024E1F891208C.wmf \ + wizard/letter/pri-bottle_l/settings.xml \ + wizard/letter/pri-mail_l/Pictures/200000430000271100001205CAE80946.wmf \ + wizard/letter/pri-mail_l/settings.xml \ + wizard/letter/pri-marine_l/Pictures/2000004B0000227F0000227886F3FC0F.wmf \ + wizard/letter/pri-marine_l/settings.xml \ + wizard/letter/pri-redline_l/settings.xml \ + wizard/report/cnt-01/settings.xml \ + wizard/report/cnt-011/settings.xml \ + wizard/report/cnt-012/settings.xml \ + wizard/report/cnt-02/settings.xml \ + wizard/report/cnt-021/settings.xml \ + wizard/report/cnt-022/settings.xml \ + wizard/report/cnt-03/settings.xml \ + wizard/report/cnt-031/settings.xml \ + wizard/report/cnt-032/settings.xml \ + wizard/report/cnt-04/settings.xml \ + wizard/report/cnt-041/settings.xml \ + wizard/report/cnt-042/settings.xml \ + wizard/report/cnt-05/settings.xml \ + wizard/report/cnt-051/settings.xml \ + wizard/report/cnt-052/settings.xml \ + wizard/report/cnt-06/settings.xml \ + wizard/report/cnt-061/settings.xml \ + wizard/report/cnt-062/settings.xml \ + wizard/report/cnt-default/settings.xml \ + wizard/report/stl-01/manifest.rdf \ + wizard/report/stl-01/Pictures/100002000000001400000014E87B6AC5.gif \ + wizard/report/stl-01/Pictures/2000018100001CB100002711BFED37A8.wmf \ + wizard/report/stl-01/settings.xml \ + wizard/report/stl-02/manifest.rdf \ + wizard/report/stl-02/Pictures/2000009E0000380100002657BA019D86.wmf \ + wizard/report/stl-02/settings.xml \ + wizard/report/stl-03/manifest.rdf \ + wizard/report/stl-03/Pictures/2000024900002711000021F4DCB2DF4A.wmf \ + wizard/report/stl-03/settings.xml \ + wizard/report/stl-04/manifest.rdf \ + wizard/report/stl-04/Pictures/10000000000000400000004077CDC8F9.png \ + wizard/report/stl-04/Pictures/10000000000001C6000000E44DCA6C94.jpg \ + wizard/report/stl-04/settings.xml \ + wizard/report/stl-05/manifest.rdf \ + wizard/report/stl-05/Pictures/2000036D000027110000145EB7E93049.wmf \ + wizard/report/stl-05/settings.xml \ + wizard/report/stl-06/manifest.rdf \ + wizard/report/stl-06/Pictures/100000000000005A000000268DE98CCE.gif \ + wizard/report/stl-06/Pictures/100000000000021B000001E8BE936AB6.gif \ + wizard/report/stl-06/settings.xml \ + wizard/report/stl-07/manifest.rdf \ + wizard/report/stl-07/settings.xml \ + wizard/report/stl-08/manifest.rdf \ + wizard/report/stl-08/Pictures/100000000000005E0000005E97FB9EF6.jpg \ + wizard/report/stl-08/settings.xml \ + wizard/report/stl-09/manifest.rdf \ + wizard/report/stl-09/Pictures/10000000000000050000004D32652675.jpg \ + wizard/report/stl-09/Pictures/100002000000001400000014E87B6AC5.gif \ + wizard/report/stl-09/Pictures/2000025100001D92000017719EB70CFB.wmf \ + wizard/report/stl-09/settings.xml \ + wizard/report/stl-default/manifest.rdf \ + wizard/report/stl-default/settings.xml \ + wizard/styles/black_white/settings.xml \ + wizard/styles/blackberry/settings.xml \ + wizard/styles/default/settings.xml \ + wizard/styles/diner/settings.xml \ + wizard/styles/fall/settings.xml \ + wizard/styles/glacier/settings.xml \ + wizard/styles/green_grapes/settings.xml \ + wizard/styles/jeans/settings.xml \ + wizard/styles/marine/settings.xml \ + wizard/styles/millennium/settings.xml \ + wizard/styles/nature/settings.xml \ + wizard/styles/neon/settings.xml \ + wizard/styles/night/settings.xml \ + wizard/styles/nostalgic/settings.xml \ + wizard/styles/pastell/settings.xml \ + wizard/styles/pool/settings.xml \ + wizard/styles/pumpkin/settings.xml \ + wizard/styles/xos/settings.xml \ + + +extra_files_WIZDESKTOP := \ + wizard/desktop/html/settings.xml \ + wizard/desktop/idxexample/Pictures/2000008600001923000012C24E0D0895.wmf \ + wizard/desktop/idxexample/settings.xml \ + + +extra_files_TEMPLATES := \ + $(extra_files_COMMON) \ + $(extra_files_PRESENTATIONS) \ + $(extra_files_WIZARD) \ + $(extra_files_WIZDESKTOP) \ + + +extra_files_TEMPLATES_RELATIVE = $(subst $(1)/,,$(filter $(1)/%,$(extra_files_TEMPLATES))) + +# vim: set noet sw=4 ts=4: