extras/CustomTarget_autocorr.mk | 17 ++++++++--------- extras/CustomTarget_autotextshare.mk | 23 +++++++++++------------ extras/CustomTarget_autotextuser.mk | 17 ++++++++--------- extras/CustomTarget_tpl_styles.mk | 35 +++++++++++++++++------------------ extras/CustomTarget_tplofficorr.mk | 35 +++++++++++++++++------------------ extras/CustomTarget_tploffimisc.mk | 24 ++++++++++++------------ extras/CustomTarget_tplpersonal.mk | 35 +++++++++++++++++------------------ extras/CustomTarget_tplpresnt.mk | 33 ++++++++++++++++----------------- 8 files changed, 106 insertions(+), 113 deletions(-)
New commits: commit afb4db718438515a5514b9247f912f970add90c7 Author: Laurent BP <[email protected]> AuthorDate: Wed May 1 20:48:46 2019 +0200 Commit: Laurent BP <[email protected]> CommitDate: Tue May 14 20:42:01 2019 +0200 tdf#125010 No compression to mimetype in all embded files same change as change https://gerrit.libreoffice.org/71473/ for : - autocorrection files .DAT - autotext share files .BAU - autotext user file .BAU - Writer templates: OfficeCorr, OfficeMisc, Personal, Styles .OTT - Impress templates .OTP Change-Id: Ie467b19bc833006fdfef45a72b9cb4a0eba8e7bd Reviewed-on: https://gerrit.libreoffice.org/71830 Tested-by: Jenkins Reviewed-by: Laurent BP <[email protected]> diff --git a/extras/CustomTarget_autocorr.mk b/extras/CustomTarget_autocorr.mk index 834150bf3b00..41868dee54bf 100644 --- a/extras/CustomTarget_autocorr.mk +++ b/extras/CustomTarget_autocorr.mk @@ -235,27 +235,24 @@ extras_AUTOCORR_XMLFILES := \ extras_AUTOCORR_MIMETYPEFILES := $(foreach lang,$(extras_AUTOCORR_LANGS),$(firstword $(subst :, ,$(lang)))/mimetype) -ifneq ($(sort $(foreach file,$(extras_AUTOCORR_XMLFILES),$(firstword $(subst /, ,$(file))))),$(sort $(foreach lang,$(extras_AUTOCORR_LANGS),$(firstword $(subst :, ,$(lang)))))) -$(call gb_Output_error,defined autocorrection languages do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/autocorr) : \ $(foreach lang,$(extras_AUTOCORR_LANGS),$(call gb_CustomTarget_get_workdir,extras/source/autocorr)/acor_$(lastword $(subst :, ,$(lang))).dat) $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%/mimetype : $(SRCDIR)/extras/source/autocorr/lang/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,autocorr/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.xml : $(SRCDIR)/extras/source/autocorr/lang/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,autocorr/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/autocorr)/%.dat : - $(call gb_Output_announce,$*.dat,$(true),ZIP,2) + $(call gb_Output_announce,autocorr/$*.dat,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOCORR_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_AUTOCORR_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOCORR_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_AUTOCORR_XMLFILES_FILTER) \ ) define extras_Autocorr_make_file_deps @@ -270,7 +267,9 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_AUTOCORR_FILES := $(foreach file,$(filter $(3)/%,$(extras_AUTOCORR_MIMETYPEFILES) $(extras_AUTOCORR_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_AUTOCORR_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOCORR_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_AUTOCORR_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOCORR_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_AUTOCORR_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) diff --git a/extras/CustomTarget_autotextshare.mk b/extras/CustomTarget_autotextshare.mk index dda8b98158c0..d73593fc61b2 100644 --- a/extras/CustomTarget_autotextshare.mk +++ b/extras/CustomTarget_autotextshare.mk @@ -3809,39 +3809,36 @@ extras_AUTOTEXTSHARE_XMLFILES := \ extras_AUTOTEXTSHARE_MIMETYPEFILES := $(foreach atexts,$(extras_AUTOTEXTSHARE_AUTOTEXTS),$(atexts)/mimetype) -ifneq ($(sort $(foreach file,$(extras_AUTOTEXTSHARE_XMLFILES),$(wordlist 1, 2, $(subst /, ,$(file))))),$(sort $(subst /, ,$(extras_AUTOTEXTSHARE_AUTOTEXTS)))) -$(call gb_Output_error,defined shared lang autotext do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/autotext) : \ $(foreach atexts,$(extras_AUTOTEXTSHARE_AUTOTEXTS),$(call gb_CustomTarget_get_workdir,extras/source/autotext)/$(atexts).bau) $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%/mimetype : $(SRCDIR)/extras/source/autotext/lang/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,autotext/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.rdf : $(SRCDIR)/extras/source/autotext/lang/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,autotext/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.svm : $(SRCDIR)/extras/source/autotext/lang/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,autotext/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.png : $(SRCDIR)/extras/source/autotext/lang/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,autotext/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/lang/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,autotext/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : - $(call gb_Output_announce,$*.bau,$(true),ZIP,2) + $(call gb_Output_announce,autotext/$*.bau,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTSHARE_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_AUTOTEXTSHARE_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTSHARE_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTSHARE_XMLFILES_FILTER) \ ) define extras_Autotextshare_make_file_deps @@ -3856,7 +3853,9 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_AUTOTEXTSHARE_FILES := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTSHARE_MIMETYPEFILES) $(extras_AUTOTEXTSHARE_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_AUTOTEXTSHARE_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTSHARE_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_AUTOTEXTSHARE_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTSHARE_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_AUTOTEXTSHARE_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk index fdbae43ba8c0..95d0bf080340 100644 --- a/extras/CustomTarget_autotextuser.mk +++ b/extras/CustomTarget_autotextuser.mk @@ -22,27 +22,24 @@ extras_AUTOTEXTUSER_MIMETYPEFILES := \ mytexts/mimetype \ -ifneq ($(sort $(foreach file,$(extras_AUTOTEXTUSER_XMLFILES),$(firstword $(subst /, ,$(file))))),$(sort $(extras_AUTOTEXTUSER_AUTOTEXTS))) -$(call gb_Output_error,defined user autotext do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/autotext/user) : \ $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/$(atexts).bau) $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,autotext/user/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,autotext/user/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : - $(call gb_Output_announce,$*.bau,$(true),ZIP,2) + $(call gb_Output_announce,autotext/user/$*.bau,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTUSER_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_AUTOTEXTUSER_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_AUTOTEXTUSER_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_AUTOTEXTUSER_XMLFILES_FILTER) \ ) define extras_Autotextuser_make_file_deps @@ -57,7 +54,9 @@ $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ | $(dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ - EXTRAS_AUTOTEXTUSER_FILES := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_AUTOTEXTUSER_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ + EXTRAS_AUTOTEXTUSER_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTUSER_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1)/user)/$(3) diff --git a/extras/CustomTarget_tpl_styles.mk b/extras/CustomTarget_tpl_styles.mk index 2128cbe1ccf8..11a66332e6a4 100644 --- a/extras/CustomTarget_tpl_styles.mk +++ b/extras/CustomTarget_tpl_styles.mk @@ -25,50 +25,47 @@ extras_STYLES_XMLFILES := \ Modern/Thumbnails/thumbnail.png \ -extras_TPLSTYLES_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_STYLES),$(atexts)/mimetype) +extras_STYLES_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_STYLES),$(atexts)/mimetype) -ifneq ($(sort $(foreach file,$(extras_STYLES_XMLFILES),$(wordlist 1, 1, $(subst /, ,$(file))))),$(sort $(extras_TEMPLATES_STYLES))) -$(call gb_Output_error,defined template text do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/templates/styles) : \ $(foreach atexts,$(extras_TEMPLATES_STYLES),$(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/$(atexts).ott) $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%/mimetype : $(SRCDIR)/extras/source/templates/styles/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.jpg : $(SRCDIR)/extras/source/templates/styles/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.png : $(SRCDIR)/extras/source/templates/styles/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.rdf : $(SRCDIR)/extras/source/templates/styles/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svg : $(SRCDIR)/extras/source/templates/styles/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.svm : $(SRCDIR)/extras/source/templates/styles/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/styles/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.xml : $(SRCDIR)/extras/source/templates/styles/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/styles/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/styles)/%.ott : - $(call gb_Output_announce,$*.ott,$(true),ZIP,2) + $(call gb_Output_announce,templates/styles/$*.ott,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_STYLES_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_STYLES_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_STYLES_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_STYLES_XMLFILES_FILTER) \ ) define extras_Tplstyles_make_file_deps @@ -79,18 +76,20 @@ endef define extras_Tplstyles_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLSTYLES_MIMETYPEFILES) $(extras_STYLES_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_STYLES_MIMETYPEFILES) $(extras_STYLES_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_STYLES_FILES := $(foreach file,$(filter $(3)/%,$(extras_TPLSTYLES_MIMETYPEFILES) $(extras_STYLES_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_STYLES_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_STYLES_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_STYLES_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_STYLES_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_STYLES_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) endef -$(eval $(foreach file,$(extras_TPLSTYLES_MIMETYPEFILES) $(extras_STYLES_XMLFILES),\ - $(call extras_Tplstyles_make_zip_deps,extras/source/templates/styles,$(file)) \ +$(eval $(foreach file,$(extras_STYLES_MIMETYPEFILES) $(extras_STYLES_XMLFILES),\ + $(call extras_Tplstyles_make_file_deps,extras/source/templates/styles,$(file)) \ )) $(eval $(foreach atexts,$(extras_TEMPLATES_STYLES),\ diff --git a/extras/CustomTarget_tplofficorr.mk b/extras/CustomTarget_tplofficorr.mk index fbed56caada6..cc43e22c26aa 100644 --- a/extras/CustomTarget_tplofficorr.mk +++ b/extras/CustomTarget_tplofficorr.mk @@ -29,50 +29,47 @@ extras_OFFICORR_XMLFILES := \ Modern_business_letter_serif/Thumbnails/thumbnail.png \ -extras_TPLOFFICORR_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFICORR),$(atexts)/mimetype) +extras_OFFICORR_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFICORR),$(atexts)/mimetype) -ifneq ($(sort $(foreach file,$(extras_OFFICORR_XMLFILES),$(wordlist 1, 1, $(subst /, ,$(file))))),$(sort $(extras_TEMPLATES_OFFICORR))) -$(call gb_Output_error,defined template text do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/templates/officorr) : \ $(foreach atexts,$(extras_TEMPLATES_OFFICORR),$(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/$(atexts).ott) $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%/mimetype : $(SRCDIR)/extras/source/templates/officorr/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.jpg : $(SRCDIR)/extras/source/templates/officorr/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.rdf : $(SRCDIR)/extras/source/templates/officorr/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.png : $(SRCDIR)/extras/source/templates/officorr/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svg : $(SRCDIR)/extras/source/templates/officorr/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.svm : $(SRCDIR)/extras/source/templates/officorr/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/officorr/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.xml : $(SRCDIR)/extras/source/templates/officorr/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/officorr/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/officorr)/%.ott : - $(call gb_Output_announce,$*.ott,$(true),ZIP,2) + $(call gb_Output_announce,templates/officorr/$*.ott,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_OFFICORR_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_OFFICORR_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_OFFICORR_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_OFFICORR_XMLFILES_FILTER) \ ) define extras_Tplofficorr_make_file_deps @@ -83,18 +80,20 @@ endef define extras_Tplofficorr_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLOFFICORR_MIMETYPEFILES) $(extras_OFFICORR_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_OFFICORR_MIMETYPEFILES) $(extras_OFFICORR_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_OFFICORR_FILES := $(foreach file,$(filter $(3)/%,$(extras_TPLOFFICORR_MIMETYPEFILES) $(extras_OFFICORR_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_OFFICORR_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFICORR_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_OFFICORR_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFICORR_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_OFFICORR_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) endef -$(eval $(foreach file,$(extras_TPLOFFICORR_MIMETYPEFILES) $(extras_OFFICORR_XMLFILES),\ - $(call extras_Tplofficorr_make_zip_deps,extras/source/templates/officorr,$(file)) \ +$(eval $(foreach file,$(extras_OFFICORR_MIMETYPEFILES) $(extras_OFFICORR_XMLFILES),\ + $(call extras_Tplofficorr_make_file_deps,extras/source/templates/officorr,$(file)) \ )) $(eval $(foreach atexts,$(extras_TEMPLATES_OFFICORR),\ diff --git a/extras/CustomTarget_tploffimisc.mk b/extras/CustomTarget_tploffimisc.mk index 79d4262ff466..4a1fc666e31f 100644 --- a/extras/CustomTarget_tploffimisc.mk +++ b/extras/CustomTarget_tploffimisc.mk @@ -24,43 +24,43 @@ extras_OFFIMISC_XMLFILES := \ Businesscard-with-logo/Thumbnails/thumbnail.png \ -extras_TPLOFFIMISC_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(atexts)/mimetype) +extras_OFFIMISC_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(atexts)/mimetype) $(call gb_CustomTarget_get_target,extras/source/templates/offimisc) : \ $(foreach atexts,$(extras_TEMPLATES_OFFIMISC),$(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/$(atexts).ott) $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%/mimetype : $(SRCDIR)/extras/source/templates/offimisc/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.jpg : $(SRCDIR)/extras/source/templates/offimisc/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.png : $(SRCDIR)/extras/source/templates/offimisc/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.rdf : $(SRCDIR)/extras/source/templates/offimisc/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svg : $(SRCDIR)/extras/source/templates/offimisc/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.svm : $(SRCDIR)/extras/source/templates/offimisc/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/offimisc/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.xml : $(SRCDIR)/extras/source/templates/offimisc/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/offimisc/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/offimisc)/%.ott : - $(call gb_Output_announce,$*.ott,$(true),ZIP,2) + $(call gb_Output_announce,templates/offimisc/$*.ott,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_OFFIMISC_DIR) && \ zip -q0X --filesync --must-match $@ $(EXTRAS_OFFIMISC_MIMEFILES_FILTER) && \ @@ -75,11 +75,11 @@ endef define extras_Tploffimisc_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLOFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_OFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_OFFIMISC_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_TPLOFFIMISC_MIMETYPEFILES)),$(subst $(3)/,,$(file))) + EXTRAS_OFFIMISC_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFIMISC_MIMETYPEFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_OFFIMISC_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_OFFIMISC_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ @@ -87,7 +87,7 @@ $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ endef -$(eval $(foreach file,$(extras_TPLOFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES),\ +$(eval $(foreach file,$(extras_OFFIMISC_MIMETYPEFILES) $(extras_OFFIMISC_XMLFILES),\ $(call extras_Tploffimisc_make_file_deps,extras/source/templates/offimisc,$(file)) \ )) diff --git a/extras/CustomTarget_tplpersonal.mk b/extras/CustomTarget_tplpersonal.mk index 0e048b46ee14..d4b82dadb533 100644 --- a/extras/CustomTarget_tplpersonal.mk +++ b/extras/CustomTarget_tplpersonal.mk @@ -29,50 +29,47 @@ extras_PERSONAL_XMLFILES := \ Resume1page/Thumbnails/thumbnail.png \ -extras_TPLPERSONAL_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_PERSONAL),$(atexts)/mimetype) +extras_PERSONAL_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_PERSONAL),$(atexts)/mimetype) -ifneq ($(sort $(foreach file,$(extras_PERSONAL_XMLFILES),$(wordlist 1, 1, $(subst /, ,$(file))))),$(sort $(extras_TEMPLATES_PERSONAL))) -$(call gb_Output_error,defined template text do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/templates/personal) : \ $(foreach atexts,$(extras_TEMPLATES_PERSONAL),$(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/$(atexts).ott) $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%/mimetype : $(SRCDIR)/extras/source/templates/personal/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.jpg : $(SRCDIR)/extras/source/templates/personal/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.png : $(SRCDIR)/extras/source/templates/personal/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.rdf : $(SRCDIR)/extras/source/templates/personal/%.rdf - $(call gb_Output_announce,$*.rdf,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*.rdf,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.svg : $(SRCDIR)/extras/source/templates/personal/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.svm : $(SRCDIR)/extras/source/templates/personal/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/personal/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.xml : $(SRCDIR)/extras/source/templates/personal/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/personal/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/personal)/%.ott : - $(call gb_Output_announce,$*.ott,$(true),ZIP,2) + $(call gb_Output_announce,templates/personal/$*.ott,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_PERSONAL_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_PERSONAL_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_PERSONAL_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_PERSONAL_XMLFILES_FILTER) \ ) define extras_Tplpersonal_make_file_deps @@ -83,18 +80,20 @@ endef define extras_Tplpersonal_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLPERSONAL_MIMETYPEFILES) $(extras_PERSONAL_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_PERSONAL_MIMETYPEFILES) $(extras_PERSONAL_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_PERSONAL_FILES := $(foreach file,$(filter $(3)/%,$(extras_TPLPERSONAL_MIMETYPEFILES) $(extras_PERSONAL_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_PERSONAL_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_PERSONAL_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_PERSONAL_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_PERSONAL_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_PERSONAL_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) endef -$(eval $(foreach file,$(extras_TPLPERSONAL_MIMETYPEFILES) $(extras_PERSONAL_XMLFILES),\ - $(call extras_Tplpersonal_make_zip_deps,extras/source/templates/personal,$(file)) \ +$(eval $(foreach file,$(extras_PERSONAL_MIMETYPEFILES) $(extras_PERSONAL_XMLFILES),\ + $(call extras_Tplpersonal_make_file_deps,extras/source/templates/personal,$(file)) \ )) $(eval $(foreach atexts,$(extras_TEMPLATES_PERSONAL),\ diff --git a/extras/CustomTarget_tplpresnt.mk b/extras/CustomTarget_tplpresnt.mk index 2028542c9e9a..0f9b604f6213 100644 --- a/extras/CustomTarget_tplpresnt.mk +++ b/extras/CustomTarget_tplpresnt.mk @@ -208,46 +208,43 @@ extras_PRESENTATIONS_XMLFILES := \ Vivid/Thumbnails/thumbnail.png \ -extras_TPLPRESNT_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_PRESENTATIONS),$(atexts)/mimetype) +extras_PRESENTATIONS_MIMETYPEFILES := $(foreach atexts,$(extras_TEMPLATES_PRESENTATIONS),$(atexts)/mimetype) -ifneq ($(sort $(foreach file,$(extras_PRESENTATIONS_XMLFILES),$(wordlist 1, 1, $(subst /, ,$(file))))),$(sort $(extras_TEMPLATES_PRESENTATIONS))) -$(call gb_Output_error,defined template presentation do not match existing directories) -endif - $(call gb_CustomTarget_get_target,extras/source/templates/presnt) : \ $(foreach atexts,$(extras_TEMPLATES_PRESENTATIONS),$(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/$(atexts).otp) $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%/mimetype : $(SRCDIR)/extras/source/templates/presnt/%/mimetype - $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) + $(call gb_Output_announce,templates/presnt/$*/mimetype,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.jpg : $(SRCDIR)/extras/source/templates/presnt/%.jpg - $(call gb_Output_announce,$*.jpg,$(true),CPY,1) + $(call gb_Output_announce,templates/presnt/$*.jpg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.svg : $(SRCDIR)/extras/source/templates/presnt/%.svg - $(call gb_Output_announce,$*.svg,$(true),CPY,1) + $(call gb_Output_announce,templates/presnt/$*.svg,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.png : $(SRCDIR)/extras/source/templates/presnt/%.png - $(call gb_Output_announce,$*.png,$(true),CPY,1) + $(call gb_Output_announce,templates/presnt/$*.png,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.svm : $(SRCDIR)/extras/source/templates/presnt/%.svm - $(call gb_Output_announce,$*.svm,$(true),CPY,1) + $(call gb_Output_announce,templates/presnt/$*.svm,$(true),CPY,1) cp $< $@ $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.xml : $(SRCDIR)/extras/source/templates/presnt/%.xml \ | $(call gb_ExternalExecutable_get_dependencies,xsltproc) - $(call gb_Output_announce,$*.xml,$(true),XSL,1) + $(call gb_Output_announce,templates/presnt/$*.xml,$(true),XSL,1) $(call gb_ExternalExecutable_get_command,xsltproc) --nonet -o $@ $(SRCDIR)/extras/util/compact.xsl $< $(call gb_CustomTarget_get_workdir,extras/source/templates/presnt)/%.otp : - $(call gb_Output_announce,$*.otp,$(true),ZIP,2) + $(call gb_Output_announce,templates/presnt/$*.otp,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_PRESENTATIONS_DIR) && \ - zip -qrX --filesync --must-match $@ $(EXTRAS_PRESENTATIONS_FILES) \ + zip -q0X --filesync --must-match $@ $(EXTRAS_PRESENTATIONS_MIMEFILES_FILTER) && \ + zip -qrX --must-match $@ $(EXTRAS_PRESENTATIONS_XMLFILES_FILTER) \ ) define extras_Tplpresnt_make_file_deps @@ -258,18 +255,20 @@ endef define extras_Tplpresnt_make_zip_deps $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_TPLPRESNT_MIMETYPEFILES) $(extras_PRESENTATIONS_XMLFILES))) \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_PRESENTATIONS_MIMETYPEFILES) $(extras_PRESENTATIONS_XMLFILES))) \ | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_PRESENTATIONS_FILES := $(foreach file,$(filter $(3)/%,$(extras_TPLPRESNT_MIMETYPEFILES) $(extras_PRESENTATIONS_XMLFILES)),$(subst $(3)/,,$(file))) + EXTRAS_PRESENTATIONS_MIMEFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_PRESENTATIONS_MIMETYPEFILES)),$(subst $(3)/,,$(file))) +$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ + EXTRAS_PRESENTATIONS_XMLFILES_FILTER := $(foreach file,$(filter $(3)/%,$(extras_PRESENTATIONS_XMLFILES)),$(subst $(3)/,,$(file))) $(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ EXTRAS_PRESENTATIONS_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) endef -$(eval $(foreach file,$(extras_TPLPRESNT_MIMETYPEFILES) $(extras_PRESENTATIONS_XMLFILES),\ - $(call extras_Tplpresnt_make_zip_deps,extras/source/templates/presnt,$(file)) \ +$(eval $(foreach file,$(extras_PRESENTATIONS_MIMETYPEFILES) $(extras_PRESENTATIONS_XMLFILES),\ + $(call extras_Tplpresnt_make_file_deps,extras/source/templates/presnt,$(file)) \ )) $(eval $(foreach atexts,$(extras_TEMPLATES_PRESENTATIONS),\ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
