[PATCH libreoffice-4-0] fdo#60386 fix l10n of windows shell extension

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2135

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/35/2135/1

fdo#60386 fix l10n of windows shell extension

(cherry picked from commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf)

Conflicts:
        shell/CustomTarget_shlxthdl_res.mk

Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
---
M shell/CustomTarget_shlxthdl_res.mk
1 file changed, 11 insertions(+), 2 deletions(-)



diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 77a3358..9b48e47 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -31,10 +31,10 @@
        $(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)
 
@@ -44,10 +44,19 @@
                cd $(SRCDIR)/shell/source/win32/shlxthandler/res && \
                BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) \
                $(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:

-- 
To view, visit https://gerrit.libreoffice.org/2135
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: David Tardon <dtardon@redhat.com>