[Libreoffice-commits] core.git: 3 commits -
David Tardon
dtardon at redhat.com
Wed Feb 13 02:00:08 PST 2013
0 files changed
New commits:
commit 7e3d969155ff38f216965cbd7dace26e74c9255c
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 13 10:59:37 2013 +0100
fix translation of crash reporter
Change-Id: I52cda360116b719bf05776e01bf3d15303eea97d
diff --git a/crashrep/CustomTarget_crashrep_res.mk b/crashrep/CustomTarget_crashrep_res.mk
index e29ecc5..c64f4cb 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:
commit 5e10c8d2b44f38df0a1a805f4ad6b6610eabecdf
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 13 10:59:09 2013 +0100
fdo#60386 fix l10n of windows shell extension
Change-Id: I5b4b839b930c294bee6727402dbc47efee7fbcd7
diff --git a/shell/CustomTarget_shlxthdl_res.mk b/shell/CustomTarget_shlxthdl_res.mk
index 6a07701..2885176 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:
commit 7c8d4cfb2bc8cb24373791ab9da4cd068baa67eb
Author: David Tardon <dtardon at redhat.com>
Date: Wed Feb 13 10:58:32 2013 +0100
let's split this for easier cherry-picking
This reverts commit fc65a66de972951946c57c8b01bfd5df46633693.
diff --git a/crashrep/CustomTarget_crashrep_res.mk b/crashrep/CustomTarget_crashrep_res.mk
index c64f4cb..e29ecc5 100644
--- a/crashrep/CustomTarget_crashrep_res.mk
+++ b/crashrep/CustomTarget_crashrep_res.mk
@@ -10,15 +10,14 @@
$(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)
@@ -27,18 +26,10 @@ $(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 $< \
+ -ulf crashrep.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 2885176..6a07701 100644
--- a/shell/CustomTarget_shlxthdl_res.mk
+++ b/shell/CustomTarget_shlxthdl_res.mk
@@ -27,19 +27,14 @@
$(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
@@ -49,18 +44,10 @@ $(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 $< \
+ -ulf shlxthdl.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:
More information about the Libreoffice-commits
mailing list