summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorZolnai Tamás <zolnaitamas2000@gmail.com>2013-12-26 21:21:22 +0100
committerZolnai Tamás <tamas.zolnai@collabora.com>2013-12-27 07:14:57 +0100
commitd1c74734c8d9026b0f0c03f7382ca60165cec8c6 (patch)
tree59b36bab691b842e6a1871328ff77be6a3902644 /solenv
parentbbee59851329142cdad62120ac02af922697e99f (diff)
Transex3: NO_LOCALIZE_EXPORT
In the past, NO_LOCALIZE_EXPORT macro must be used to skip uneeded parsing of src files which has no localizable content. It is unsued by now and it is more effective to handle this files on gmake level: gb_SrsTarget_add_nonlocalizable_files gb_SrsTarget_add_nonlocalizable_templates Plus remove some empty src file. Change-Id: I8fc9b2db0b5fd7a3379d3c5be970c4fc691f4c53
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/AllLangResTarget.mk40
1 files changed, 27 insertions, 13 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 35afd1aaa5aa..4289db1d6687 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -128,7 +128,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_
mkdir -p $$(dir $$@) && \
cp $$< $$@)
ifneq ($(strip $(gb_WITH_LANG)),)
-$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true))
+$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(2))
endif
endef
@@ -202,7 +202,7 @@ $(call gb_SrsTemplateTarget_get_clean_target,%) :
$(foreach part,$(PARTS),$(call gb_SrsPartMergeTarget_get_target,$(part))))
define gb_SrsTemplateTarget_add_file
-$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2))
+$(call gb_SrsTemplatePartTarget_SrsTemplatePartTarget,$(2),$(3))
$(call gb_SrsTemplateTarget_get_target,$(1)) : PARTS += $(2)
$(call gb_SrsTemplateTarget_get_clean_target,$(1)) : PARTS += $(2)
$(call gb_SrsTemplateTarget__get_target,$(1)) : $(call gb_SrsTemplatePartTarget_get_target,$(2))
@@ -316,28 +316,24 @@ $(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file)))
endef
# Add a srs file that does not have any localizable content.
+# These files will be copied instead of parsing them with transex3.
#
-# 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
+# gb_SrsTarget_add_nonlocalizable_file srs file
+define gb_SrsTarget_add_nonlocalizable_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)))
+# gb_SrsTarget_add_nonlocalizable_files srs file(s)
+define gb_SrsTarget_add_nonlocalizable_files
+$(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalizable_file,$(1),$(file)))
endef
define gb_SrsTarget_add_template
-$(call gb_SrsTemplateTarget_add_file,$(1),$(2))
+$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(true))
endef
@@ -346,6 +342,24 @@ $(foreach template,$(2),$(call gb_SrsTarget_add_template,$(1),$(template)))
endef
+# Add a srs template that does not have any localizable content.
+# These files will be copied instead of parsing them with transex3.
+#
+# gb_SrsTarget_add_nonlocalizable_template srs template
+define gb_SrsTarget_add_nonlocalizable_template
+$(call gb_SrsTemplateTarget_add_file,$(1),$(2),$(false))
+
+endef
+
+# Add srs templates that do not have any localizable content.
+#
+# gb_SrsTarget_add_nonlocalizable_templates srs template(s)
+define gb_SrsTarget_add_nonlocalizable_templates
+$(foreach template,$(2),$(call gb_SrsTarget_add_nonlocalizable_template,$(1),$(template)))
+
+endef
+
+
# Use templates built by another SrsTarget.
#
# gb_SrsTarget_use_srstarget srs other-srs