[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - shell/CustomTarget_shlxthdl_res.mk

[David Tardon]

 shell/CustomTarget_shlxthdl_res.mk |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit d13a9d558b5f5bf4c0c29787160878ab5ac9918d
Author: David Tardon <dtardon at redhat.com>
Date:   Wed Feb 13 10:59:09 2013 +0100

    fdo#60386 fix l10n of windows shell extension
    
    (cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)
    
    Conflicts:
    	shell/CustomTarget_shlxthdl_res.mk
    
    Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
    Reviewed-on: https://gerrit.libreoffice.org/2136
    Reviewed-by: Andras Timar <atimar at suse.com>
    Tested-by: Andras Timar <atimar at suse.com>

diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 67e27a6..5a3bcb5 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,shell/source/win32/shlxthandler/res) : \
 	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc
 
 $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl_impl.rc : \
+	$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcfooter.txt \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rcheader.txt \
 	$(SRCDIR)/shell/source/win32/shlxthandler/res/rctmpl.txt \
-	$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
 	| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir \
 	$(call gb_Executable_get_target_for_build,lngconvex)
 
@@ -43,10 +43,19 @@ $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
 	$(call gb_Helper_abbreviate_dirs,\
 		cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
 		$(call gb_Executable_get_target_for_build,lngconvex) \
-			-ulf shlxthdl.ulf \
+			-ulf $< \
 			-rc $@ \
 			-rct rctmpl.txt \
 			-rch rcheader.txt \
 			-rcf rcfooter.txt)
 
+$(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl.ulf : \
+		$(SRCDIR)/shell/source/win32/shlxthandler/res/shlxthdl.ulf \
+		$(call gb_Executable_get_target_for_build,ulfex) \
+		| $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir
+	MERGEINPUT=`$(gb_MKTEMP)` && \
+	echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \
+	$(call gb_Executable_get_target_for_build,ulfex) -p shell -i $< -o $@ -m $${MERGEINPUT} -l all && \
+	rm -f $${MERGEINPUT}
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab: