chart2/AllLangResTarget_chartcontroller.mk | 3 +
connectivity/AllLangResTarget_hsqldb.mk | 2 -
dbaccess/AllLangResTarget_dbu.mk | 5 ++-
sd/AllLangResTarget_sd.mk | 5 ++-
sfx2/AllLangResTarget_sfx2.mk | 5 ++-
solenv/gbuild/AllLangResTarget.mk | 45 +++++++++++++++++++++++++----
svtools/AllLangResTarget_svt.mk | 5 ++-
svx/AllLangResTarget_svx.mk | 5 ++-
toolkit/AllLangResTarget_tk.mk | 2 -
wizards/AllLangResTarget_wzi.mk | 2 -
10 files changed, 66 insertions(+), 13 deletions(-)
New commits:
commit 7a11b9cc6d8a4116771333445637bb5b251420c8
Author: David Tardon <dtar...@redhat.com>
Date: Thu Nov 15 12:32:43 2012 +0100
ensure translations are built before using them
Change-Id: Ia172f144616d7468466a057bb1a431b3047209fd
diff --git a/chart2/AllLangResTarget_chartcontroller.mk
b/chart2/AllLangResTarget_chartcontroller.mk
index ec8dd82..9ebb4e0 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -93,6 +93,9 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
chart2/source/controller/dialogs/tp_TitleRotation.src \
chart2/source/controller/dialogs/tp_Trendline.src \
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
+))
+
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,chart2/res,\
chart2/source/controller/menus/ShapeContextMenu.src \
chart2/source/controller/menus/ShapeEditContextMenu.src \
))
diff --git a/connectivity/AllLangResTarget_hsqldb.mk
b/connectivity/AllLangResTarget_hsqldb.mk
index 4bccc5e..173a344 100644
--- a/connectivity/AllLangResTarget_hsqldb.mk
+++ b/connectivity/AllLangResTarget_hsqldb.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_SrsTarget_set_include,hsqldb/res,\
$$(INCLUDE) \
))
-$(eval $(call gb_SrsTarget_add_files,hsqldb/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,hsqldb/res,\
connectivity/source/drivers/hsqldb/hsqlui.src \
))
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index 1e353af..7f2a3d1 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/dlg/textconnectionsettings.src \
dbaccess/source/ui/dlg/UserAdminDlg.src \
dbaccess/source/ui/dlg/UserAdmin.src \
- dbaccess/source/ui/imagelists/dbimagelists.src \
dbaccess/source/ui/misc/dbumiscres.src \
dbaccess/source/ui/misc/WizardPages.src \
dbaccess/source/ui/querydesign/querydlg.src \
@@ -92,6 +91,10 @@ $(eval $(call gb_SrsTarget_add_files,dbaccess/dbu,\
dbaccess/source/ui/uno/dbinteraction.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,dbaccess/dbu,\
+ dbaccess/source/ui/imagelists/dbimagelists.src \
+))
+
$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \
dbaccess/source/ui/inc/toolbox_tmpl.hrc \
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index 8b24917..455dbbc 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -99,11 +99,14 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
sd/source/ui/dlg/tpoption.src \
sd/source/ui/dlg/vectdlg.src \
sd/source/ui/slideshow/slideshow.src \
- sd/source/ui/slidesorter/view/SlsResource.src \
sd/source/ui/table/TableDesignPane.src \
sd/source/ui/view/DocumentRenderer.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,sd/res,\
+ sd/source/ui/slidesorter/view/SlsResource.src \
+))
+
$(eval $(call gb_SrsTarget_add_templates,sd/res,\
sd/source/ui/app/menuids3_tmpl.src \
sd/source/ui/app/menuids_tmpl.src \
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index e106455..81ff3c7 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -48,7 +48,6 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/appl/sfx.src \
sfx2/source/bastyp/bastyp.src \
sfx2/source/bastyp/fltfnc.src \
- sfx2/source/control/templateview.src \
sfx2/source/dialog/alienwarn.src \
sfx2/source/dialog/dialog.src \
sfx2/source/dialog/dinfdlg.src \
@@ -79,4 +78,8 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
sfx2/source/view/view.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,sfx/res,\
+ sfx2/source/control/templateview.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index eaaf482..7247b18 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -67,6 +67,16 @@ endef
$(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/%
$(gb_Helper_MISCDUMMY) $(gb_SrsPartMergeTarget_TRANSEXTARGET)
$(if $(SDF),$(call gb_SrsPartMergeTarget__command,$@,$*,$<),mkdir -p
$(dir $@) && cp $< $@)
+define gb_SrsPartMergeTarget_SrsPartMergeTarget
+$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if
$(2),$(gb_SDFLOCATION)/$(dir $(1))localize.sdf))
+
+endef
+
+define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(2)
+$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(2)
+
+endef
# SrsPartTarget class
@@ -110,7 +120,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE :=
else
$(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call
gb_SrsPartMergeTarget_get_target,$(1))
$(call gb_SrsPartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_get_target,$(1))
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
+$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(2))
endif
endef
@@ -123,8 +133,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : SDF := $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
-$(call gb_SrsPartMergeTarget_get_target,$(1)) : $(gb_SDFLOCATION)/$(dir
$(1))localize.sdf
+$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true))
endif
endef
@@ -275,11 +284,11 @@ endif
endef
-define gb_SrsTarget_add_file
+define gb_SrsTarget__add_file
ifeq ($(gb_FULLDEPS),$(true))
$(call gb_SrsTarget_get_dep_target,$(1)) : $(call
gb_SrsPartTarget_get_dep_target,$(2))
endif
-$(call gb_SrsPartTarget_SrsPartTarget,$(2))
+$(call gb_SrsPartTarget_SrsPartTarget,$(2),$(3))
$(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2))
$(call gb_SrsPartTarget_get_target,$(2)) :| $(call
gb_SrsTarget_get_external_headers_target,$(1))
$(call gb_SrsPartTarget_get_target,$(2)) :| $(call
gb_SrsTemplateTarget_get_target,$(1))
@@ -288,11 +297,37 @@ $(call gb_SrsTarget_get_target,$(1)) : PARTS += $(2)
endef
+define gb_SrsTarget_add_file
+$(call gb_SrsTarget__add_file,$(1),$(2),$(true))
+
+endef
+
define gb_SrsTarget_add_files
$(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
endef
+# Add a srs file that does not have any localizable content.
+#
+# This only exists to allow dependencies on SDF files. It must be used
+# if neither of the srs files in a directory have any localizable
+# content, because in that case there is going to be no SDF generated
+# for the directory. Therefore we must avoid depending on the SDF.
+#
+# gb_SrsTarget_add_nonlocalized_file srs file
+define gb_SrsTarget_add_nonlocalized_file
+$(call gb_SrsTarget__add_file,$(1),$(2),$(false))
+
+endef
+
+# Add srs files that do not have any localizable content.
+#
+# gb_SrsTarget_add_nonlocalized_files srs file(s)
+define gb_SrsTarget_add_nonlocalized_files
+$(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalized_file,$(1),$(file)))
+
+endef
+
define gb_SrsTarget_add_template
$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 165552d..9c2315f 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -51,7 +51,6 @@ $(eval $(call gb_SrsTarget_set_include,svt/res,\
))
$(eval $(call gb_SrsTarget_add_files,svt/res,\
- svtools/source/brwbox/editbrowsebox.src \
svtools/source/contnr/fileview.src \
svtools/source/contnr/svcontnr.src \
svtools/source/contnr/templwin.src \
@@ -75,4 +74,8 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\
svtools/source/toolpanel/toolpanel.src \
))
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,svt/res,\
+ svtools/source/brwbox/editbrowsebox.src \
+))
+
# vim: set noet sw=4 ts=4:
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index fa4d86c..daaf763 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -91,7 +91,6 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/form/formshell.src \
svx/source/items/svxerr.src \
svx/source/items/svxitems.src \
- svx/source/mnuctrls/mnuctrls.src \
svx/source/stbctrls/stbctrls.src \
svx/source/svdraw/svdstr.src \
svx/source/table/table.src \
@@ -105,6 +104,10 @@ $(eval $(call gb_SrsTarget_add_files,svx/res,\
svx/source/tbxctrls/tbunosearchcontrollers.src \
svx/source/toolbars/extrusionbar.src \
svx/source/toolbars/fontworkbar.src \
+))
+
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,svx/res,\
+ svx/source/mnuctrls/mnuctrls.src \
svx/source/unodraw/unodraw.src \
))
diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index 10e55d9..e4cffd4 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_SrsTarget_set_include,toolkit/awt,\
-I$(SRCDIR)/toolkit/source/awt \
))
-$(eval $(call gb_SrsTarget_add_files,toolkit/awt,\
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,toolkit/awt,\
toolkit/source/awt/xthrobber.src \
))
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
index e7d3c3c..b668809 100644
--- a/wizards/AllLangResTarget_wzi.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_AllLangResTarget_add_srs,wzi,\
$(eval $(call gb_SrsTarget_SrsTarget,wzi/res))
-$(eval $(call gb_SrsTarget_add_files,wzi/res,\
+$(eval $(call gb_SrsTarget_add_nonlocalized_files,wzi/res,\
wizards/source/imagelists/imagelists.src \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
