From e9dd058ccd0de193cdbc9ae8638f603569249c5e Mon Sep 17 00:00:00 2001 From: Laurent Balland-Poirier Date: Fri, 6 Jun 2014 22:56:05 +0200 Subject: Build all l10n AutoText MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove .bau files - Unzip .bau - Add missing mimetype files - Remove trailing spaces and tabs - Change directory names of standard/FN/Object 1 to standard/FN/Object_1 - Add files to project (3800 files) - Remove non-UTF8 characters in sk/template/HLB and sk/template/HRB - Move user autotext in CustomTarget to a sub directory "user" to avoid conflict with shared autotext - Change all META-INF/manifest.xml to add DOCTYPE line and complete manifest tag - Add AllLangCustomTarget_autotextshare.mk - Make relative path for office.dtd and Manifest.dtd in xml file - Correct pl/standard/ZO/atevent.xml and pl/template/PT1/atevent.xml Caolan's dream: https://bugs.freedesktop.org/show_bug.cgi?id=40499#c36 Change-Id: I17486cd88f380976990291a7d12969cc7751fb84 Reviewed-on: https://gerrit.libreoffice.org/9954 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- extras/CustomTarget_autotextuser.mk | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'extras/CustomTarget_autotextuser.mk') diff --git a/extras/CustomTarget_autotextuser.mk b/extras/CustomTarget_autotextuser.mk index ce474344fd44..6b161497ebd0 100644 --- a/extras/CustomTarget_autotextuser.mk +++ b/extras/CustomTarget_autotextuser.mk @@ -7,7 +7,7 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext)) +$(eval $(call gb_CustomTarget_CustomTarget,extras/source/autotext/user)) extras_AUTOTEXTUSER_AUTOTEXTS := \ mytexts \ @@ -26,19 +26,19 @@ ifneq ($(sort $(foreach file,$(extras_AUTOTEXTUSER_XMLFILES),$(firstword $(subst $(call gb_Output_error,defined user autotext do not match existing directories) endif -$(call gb_CustomTarget_get_target,extras/source/autotext) : \ - $(foreach atexts,$(extras_AUTOTEXTUSER_AUTOTEXTS),$(call gb_CustomTarget_get_workdir,extras/source/autotext)/$(atexts).bau) +$(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)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype +$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%/mimetype : $(SRCDIR)/extras/source/autotext/%/mimetype $(call gb_Output_announce,$*/mimetype,$(true),CPY,1) cp $< $@ -$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.xml : $(SRCDIR)/extras/source/autotext/%.xml \ +$(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_ExternalExecutable_get_command,xsltproc) -o $@ $(SRCDIR)/extras/util/compact.xsl $< -$(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : +$(call gb_CustomTarget_get_workdir,extras/source/autotext/user)/%.bau : $(call gb_Output_announce,$*.bau,$(true),ZIP,2) $(call gb_Helper_abbreviate_dirs,\ cd $(EXTRAS_AUTOTEXTUSER_DIR) && \ @@ -46,20 +46,20 @@ $(call gb_CustomTarget_get_workdir,extras/source/autotext)/%.bau : ) define extras_Autotextuser_make_file_deps -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : $(SRCDIR)/$(1)/$(2) \ - | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : $(SRCDIR)/$(1)/$(2) \ + | $(dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2)).dir endef define extras_Autotextuser_make_zip_deps -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - $(addprefix $(call gb_CustomTarget_get_workdir,$(1))/,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES))) \ - | $(dir $(call gb_CustomTarget_get_workdir,$(1))/$(2)).dir +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ + $(addprefix $(call gb_CustomTarget_get_workdir,$(1)/user)/,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES))) \ + | $(dir $(call gb_CustomTarget_get_workdir,$(1)/user)/$(2)).dir -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ EXTRAS_AUTOTEXTUSER_FILES := $(foreach file,$(filter $(3)/%,$(extras_AUTOTEXTUSER_MIMETYPEFILES) $(extras_AUTOTEXTUSER_XMLFILES)),$(subst $(3)/,,$(file))) -$(call gb_CustomTarget_get_workdir,$(1))/$(2) : \ - EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1))/$(3) +$(call gb_CustomTarget_get_workdir,$(1)/user)/$(2) : \ + EXTRAS_AUTOTEXTUSER_DIR := $(call gb_CustomTarget_get_workdir,$(1)/user)/$(3) endef -- cgit