diff options
| author | David Tardon <dtardon@redhat.com> | 2013-02-13 10:52:29 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-02-13 10:54:41 +0100 |
| commit | fc65a66de972951946c57c8b01bfd5df46633693 (patch) | |
| tree | 9b170da9bc2586051278e4aa2663042bef77ad73 | |
| parent | ignore errors (diff) | |
| download | core-fc65a66de972951946c57c8b01bfd5df46633693.tar.gz core-fc65a66de972951946c57c8b01bfd5df46633693.zip | |
fdo#60386 fix l10n of windows shell extension
Throw in crash reporter as a bonus.
Change-Id: Ia1eccd4a3948b3c6d361b341599c7f565cd74cfb
| -rw-r--r-- | crashrep/CustomTarget_crashrep_res.mk | 13 | ||||
| -rw-r--r-- | shell/CustomTarget_shlxthdl_res.mk | 17 |
2 files changed, 26 insertions, 4 deletions
diff --git a/crashrep/CustomTarget_crashrep_res.mk b/crashrep/CustomTarget_crashrep_res.mk index e29ecc557620..c64f4cb8cc21 100644 --- a/crashrep/CustomTarget_crashrep_res.mk +++ b/crashrep/CustomTarget_crashrep_res.mk @@ -10,14 +10,15 @@ $(eval $(call gb_CustomTarget_CustomTarget,crashrep/source/win32)) $(eval $(call gb_CustomTarget_register_targets,crashrep/source/win32, \ + crashrep.ulf \ crashrep_impl.rc \ )) $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : \ + $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf \ $(SRCDIR)/crashrep/source/win32/rcfooter.txt \ $(SRCDIR)/crashrep/source/win32/rcheader.txt \ $(SRCDIR)/crashrep/source/win32/rctemplate.txt \ - $(SRCDIR)/crashrep/source/win32/crashrep.ulf \ $(call gb_Executable_get_runtime_dependencies,lngconvex) #BRAND_BASE_DIR=$(call gb_Helper_make_url,$(OUTDIR)/unittest/install) @@ -26,10 +27,18 @@ $(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep_impl.rc : $(call gb_Helper_abbreviate_dirs,\ cd $(SRCDIR)/crashrep/source/win32 && \ $(call gb_Executable_get_command,lngconvex) \ - -ulf crashrep.ulf \ + -ulf $< \ -rc $@ \ -rct rctemplate.txt \ -rch rcheader.txt \ -rcf rcfooter.txt) +$(call gb_CustomTarget_get_workdir,crashrep/source/win32)/crashrep.ulf : \ + $(SRCDIR)/crashrep/source/win32/crashrep.ulf \ + $(call gb_Executable_get_runtime_dependencies,ulfex) + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \ + $(call gb_Executable_get_command,ulfex) -p crashrep -i $< -o $@ -m $${MERGEINPUT} -l all && \ + rm -f $${MERGEINPUT} + # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk index 6a07701154ea..2885176b52ec 100644 --- a/shell/CustomTarget_shlxthdl_res.mk +++ b/shell/CustomTarget_shlxthdl_res.mk @@ -27,14 +27,19 @@ $(eval $(call gb_CustomTarget_CustomTarget,shell/source/win32/shlxthandler/res)) +$(eval $(call gb_CustomTarget_register_targets,shell/source/win32/shlxthandler/res,\ + shlxthdl.ulf \ + shlxthdl_impl.rc \ +)) + $(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_Executable_get_runtime_dependencies,lngconvex) \ | $(call gb_CustomTarget_get_workdir,shell/source/win32/shlxthandler/res)/.dir @@ -44,10 +49,18 @@ $(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_command,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_runtime_dependencies,ulfex) + MERGEINPUT=`$(gb_MKTEMP)` && \ + echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(subst $(SRCDIR)/,,$(dir $<))).po) > $${MERGEINPUT} && \ + $(call gb_Executable_get_command,ulfex) -p shell -i $< -o $@ -m $${MERGEINPUT} -l all && \ + rm -f $${MERGEINPUT} + # vim: set shiftwidth=4 tabstop=4 noexpandtab: |