diff options
| author | Laurent BP <laurent.balland-poirier@laposte.net> | 2019-05-01 20:48:46 +0200 |
|---|---|---|
| committer | Laurent BP <laurent.balland-poirier@laposte.net> | 2019-05-14 20:42:01 +0200 |
| commit | afb4db718438515a5514b9247f912f970add90c7 (patch) | |
| tree | a3879f05191df75b523c5b487e0e9867cae54fdd /extras/CustomTarget_autotextuser.mk | |
| parent | 35ab83872f184c22c5f52f43ee38d3669340b192 (diff) | |
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 <laurent.balland-poirier@laposte.net>
Diffstat (limited to 'extras/CustomTarget_autotextuser.mk')
| -rw-r--r-- | extras/CustomTarget_autotextuser.mk | 17 |
1 files changed, 8 insertions, 9 deletions
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) |