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

[David Tardon]

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

New commits:
commit a648103cfc0c4d51f2ad929d9514561e47106a9e
Author: David Tardon <dtar...@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/2135
    Reviewed-by: Andras Timar <ati...@suse.com>
    Tested-by: Andras Timar <ati...@suse.com>

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_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)
 
@@ -44,10 +44,19 @@ $(call 
gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/shlxthdl
                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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits