[Libreoffice-commits] core.git: solenv/gbuild

Michael Stahl mstahl at redhat.com
Tue Apr 16 08:59:05 PDT 2013


 solenv/gbuild/Dictionary.mk |   14 ++++++++++++++
 1 file changed, 14 insertions(+)

New commits:
commit 4ff3a87282185a3bd3dfa69128596e6e3b41ce18
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 16 17:54:24 2013 +0200

    gbuild: add gb_Dictionary_add_localized_xcu_file
    
    ... which fixed en-US only builds of dictionaries.
    
    Change-Id: Icc6e02bee80c10c5388dcac193fbcf1d36f6c50a

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index 9184b89..60f72d0 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -285,6 +285,20 @@ $(foreach file,$(3),$(call gb_Dictionary_add_generated_file,$(1),$(2)/$(notdir $
 
 endef
 
+# Adds a localized xcu file, which needs special handling because it may be
+# in $(WORKDIR) or $(SRCDIR) depending on whether translations are built.
+#
+# gb_Dictionary_add_localized_xcu_file dictionary destdir file
+define gb_Dictionary_add_localized_xcu_file
+ifeq ($(gb_WITH_LANG),)
+$(call gb_Dictionary__add_file,$(1),$(1),$(2),$(strip $(3)))
+else
+$(call gb_Dictionary__add_file,$(1),$(1)_generated,$(2),$(subst $(WORKDIR)/,,$(call gb_XcuFile_for_extension,$(strip $(3)))))
+$(call gb_PackageSet_add_package,$(call gb_Dictionary_get_packagesetname,$(1)),$(call gb_Dictionary_get_packagename,$(1)_generated))
+endif
+
+endef
+
 # Adds a file to the root dir of the dictionary
 #
 # gb_Dictionary_add_root_file dictionary file


More information about the Libreoffice-commits mailing list