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

[Michael Stahl]

 dictionaries                |    2 +-
 solenv/gbuild/Dictionary.mk |   24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

New commits:
commit b3a60fc6c4588481a394aaddd0ff0a55c48c7eee
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Apr 16 17:52:11 2013 +0200

    Updated core
    Project: dictionaries  faf63ac08a9f3f1463a7f119083964f76b71141c

diff --git a/dictionaries b/dictionaries
index b32611e..faf63ac 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b32611e23a1f35f16f4c37bbbdc02027157424d1
+Subproject commit faf63ac08a9f3f1463a7f119083964f76b71141c
commit 28709dc607dc8738f5048429940b3f3232d52e12
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Apr 16 17:48:57 2013 +0200

    add spec. handling for xcu files to gb_Dictionary
    
    The xcu files can either come directly from $(SRCDIR) or be generated,
    depending on whether the build is with or without langs. This
    distinction did not matter while Dictionary was using ExtensionTarget
    for its impl., becuase there the file was just copied to the
    ExtensionTarget's root dir. Now that Dictionary uses Package internally,
    it is necessary to know where the file comes from to put it into the
    right package, either the one for $(SRCDIR) or the one for $(WORKDIR).
    
    (Yes, it would be possible to use just one Package with base dir /, but
    I consider this ugly.)
    
    Change-Id: I4549923287abc968f1c042b809db06d688b4c573

diff --git a/solenv/gbuild/Dictionary.mk b/solenv/gbuild/Dictionary.mk
index a59ba5a..9184b89 100644
--- a/solenv/gbuild/Dictionary.mk
+++ b/solenv/gbuild/Dictionary.mk
@@ -371,4 +371,28 @@ $(foreach propertyfile,$(3),$(call gb_Dictionary_add_propertyfile,$(1),$(2)/$(no
 
 endef
 
+# Add a configuration file to the dictionary.
+#
+# HACK: The xcu file might come from $(WORKDIR), if we are building with
+# langs (because it is localized then), or from $(SRCDIR), if we are
+# not. So we must handle it specially.
+#
+# gb_Dictionary_add_xcufile dictionary destfile xcufile
+define gb_Dictionary_add_xcufile
+ifeq ($(gb_WITH_LANG),)
+$(call gb_Dictionary_add_file,$(1),$(2),$(3))
+else
+$(call gb_Dictionary_add_generated_file,$(1),$(2),$(call gb_XcuMergeTarget_get_target,$(3)))
+endif
+
+endef
+
+# Add several configuration file to the dictionary at once.
+#
+# gb_Dictionary_add_xcufiles dictionary destdir xcufile(s)
+define gb_Dictionary_add_xcufiles
+$(foreach xcufile,$(3),$(call gb_Dictionary_add_xcufile,$(1),$(2)/$(notdir $(xcufile)),$(xcufile)))
+
+endef
+
 # vim: set noet sw=4 ts=4: