solenv/gbuild/UI.mk | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 8b86cb65933c4a522ea4f8cc77016cfb8ebc31f6
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Wed Oct 3 23:24:05 2012 +0200
Ui merge from po files
Change-Id: Id699cf94c17016c9af87fad389339cf323329741
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index 509a087..9540c15 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -16,13 +16,16 @@ gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ldpath)
$(gb_UILocalizeTarget_TAR
define gb_UILocalizeTarget__command
$(call gb_Output_announce,$(2),$(true),UIX,1)
+MERGEINPUT=`$(gb_MKTEMP)` && \
+echo $(POFILES) > $${MERGEINPUT} && \
$(call gb_Helper_abbreviate_dirs,\
$(gb_UILocalizeTarget_COMMAND) \
-i $(UI_FILE) \
-o $(1) \
-l $(UI_LANG) \
- -m $(SDF) \
-)
+ -m $${MERGEINPUT} ) && \
+rm -rf $${MERGEINPUT}
+
endef
$(dir $(call gb_UILocalizeTarget_get_target,%))%/.dir :
@@ -42,11 +45,11 @@ $(call gb_UILocalizeTarget_get_clean_target,%) :
#
# gb_UILocalizeTarget_UILocalizeTarget target source lang
define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(2))localize.sdf
+$(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(foreach
lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(2))).po)
$(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(2).ui
$(call gb_UILocalizeTarget_get_target,$(1)) : UI_LANG := $(3)
-$(call gb_UILocalizeTarget_get_target,$(1)) : $$(SDF)
+$(call gb_UILocalizeTarget_get_target,$(1)) : $(foreach
lang,$(gb_UITarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(2))).po)
$(call gb_UILocalizeTarget_get_target,$(1)) : $$(UI_FILE)
$(call gb_UILocalizeTarget_get_target,$(1)) :| $(dir $(call
gb_UILocalizeTarget_get_target,$(1))).dir
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
