solenv/gbuild/AllLangResTarget.mk | 2 +-
solenv/gbuild/Configuration.mk | 7 +++----
solenv/gbuild/ExtensionTarget.mk | 14 +++++---------
solenv/gbuild/InstallModuleTarget.mk | 7 +++----
solenv/gbuild/UI.mk | 3 +--
solenv/gbuild/extensions/pre_SharedLangList.mk | 2 ++
6 files changed, 15 insertions(+), 20 deletions(-)
New commits:
commit 7dd273da8a2c6ccd851d756f1cc7f6ea6f0961c8
Author: Zolnai Tamás <zolnaitamas2...@gmail.com>
Date: Mon Dec 24 06:19:40 2012 +0100
Delete some lang variable
Change-Id: I4df609dad5de0cc45f00f4c4054b59fa014bb432
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 0dd69e5..65105b6 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -73,7 +73,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/%
$(gb_Helper_MISCDUMMY)
mkdir -p $(dir $@) && cp $< $@)
define gb_SrsPartMergeTarget_SrsPartMergeTarget
-$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach
lang,$(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG))),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)))
+$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)))
endef
define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 47645a6..59e8a96 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -253,7 +253,6 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) :
gb_XcuMergeTarget_CFGEXTARGET := $(call
gb_Executable_get_target_for_build,cfgex)
gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path)
$(gb_XcuMergeTarget_CFGEXTARGET)
-gb_XcuMergeTarget_LANGS := $(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG)))
# PRJNAME is computed from the stem (parameter $(2))
define gb_XcuMergeTarget__command
@@ -286,10 +285,10 @@ $(call gb_XcuMergeTarget_get_clean_target,%) :
define gb_XcuMergeTarget_XcuMergeTarget
$(call gb_XcuMergeTarget_get_target,$(1)) : \
$(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
- $(wildcard $(foreach
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
+ $(wildcard $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
$(call gb_XcuMergeTarget_get_target,$(1)) : \
- POFILES := $(foreach
lang,$(gb_XcuMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)
-$(foreach
lang,$(gb_XcuMergeTarget_TRANS_LANG),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po) :
+ POFILES := $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
+$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po) :
endef
diff --git a/solenv/gbuild/ExtensionTarget.mk b/solenv/gbuild/ExtensionTarget.mk
index b3fb4f0..4899e13 100644
--- a/solenv/gbuild/ExtensionTarget.mk
+++ b/solenv/gbuild/ExtensionTarget.mk
@@ -148,10 +148,10 @@ $(call
gb_ExtensionTarget_get_workdir,$(1))/description.xml :| \
ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_ExtensionTarget_get_target,$(1)) : \
- POFILES := $(foreach lang,$(filter-out
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po)
+ POFILES := $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
$(call gb_ExtensionTarget_get_workdir,$(1))/description.xml : \
- $(foreach lang,$(filter-out
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po)
-$(foreach lang,$(filter-out
qtz,$(gb_ExtensionTarget_TRANS_LANGS)),$(gb_POLOCATION)/$(lang)/$(2).po) :
+ $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po)
+$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(2).po) :
endif
$(foreach lang,$(gb_ExtensionTarget_ALL_LANGS), \
@@ -235,9 +235,9 @@ endef
# localize .properties file
# source file is copied to $(WORKDIR)
define gb_ExtensionTarget_localize_properties
-ifneq ($(filter-out en-US,$(gb_ExtensionTarget_ALL_LANGS)),)
+ifneq ($(gb_TRANS_LANGS),)
ifneq ($(ENABLE_RELEASE_BUILD),TRUE)
-$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst
en_US,qtz,$(2)),$(3),qtz,$(firstword $(filter-out
en-US,$(gb_ExtensionTarget_ALL_LANGS))))
+$(call gb_ExtensionTarget_localize_properties_onelang,$(1),$(subst
en_US,qtz,$(2)),$(3),qtz,$(firstword $(gb_TRANS_LANGS)))
endif
endif
$(foreach lang,$(filter-out qtz,$(gb_ExtensionTarget_ALL_LANGS)),\
@@ -326,7 +326,6 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done
: \
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done : \
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
-ifneq ($(strip $(gb_WITH_LANG)),)
ifneq ($(filter-out en-US,$(5)),)
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
@@ -334,7 +333,6 @@ $(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3)
: \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(or $(4),$(3)))))
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst
./,.po,$(dir $(or $(4),$(3))))) :
endif
-endif
$(call gb_ExtensionTarget_get_workdir,$(1))/help/$(5)/$(3) : \
$(if $(filter-out en-US,$(5)),$(gb_ExtensionTarget_HELPEXTARGET)) | \
$(call gb_ExtensionTarget_get_workdir,$(1))/help/.dir
@@ -368,7 +366,6 @@ endef
define gb_ExtensionTarget__localize_helptreefile_onelang
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5).done : \
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3)
-ifneq ($(strip $(gb_WITH_LANG)),)
ifneq ($(filter-out en-US,$(5)),)
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
POFILE := $(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(4))))
@@ -376,7 +373,6 @@ $(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3)
: \
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst
%/,/%.po,$(patsubst ./,.po,$(dir $(4))))
$(gb_POLOCATION)/$(5)$(subst $(SRCDIR),,$(2))$(patsubst %/,/%.po,$(patsubst
./,.po,$(dir $(4)))) :
endif
-endif
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)-xhp.done
$(call gb_ExtensionTarget_get_rootdir,$(1))/help/$(5)/$(3) : \
diff --git a/solenv/gbuild/InstallModuleTarget.mk
b/solenv/gbuild/InstallModuleTarget.mk
index a150f26..e7c6b06 100644
--- a/solenv/gbuild/InstallModuleTarget.mk
+++ b/solenv/gbuild/InstallModuleTarget.mk
@@ -113,7 +113,6 @@ endef
gb_ScpMergeTarget_TARGET := $(call gb_Executable_get_target_for_build,ulfex)
gb_ScpMergeTarget_COMMAND := $(gb_Helper_set_ld_path)
$(gb_ScpMergeTarget_TARGET)
-gb_ScpMergeTarget_LANGS := $(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG)))
gb_ScpMergeTarget_get_source = $(SRCDIR)/$(1).ulf
@@ -144,10 +143,10 @@ $(call gb_ScpMergeTarget_get_target,$(1)) : SCP_SOURCE :=
$(call gb_ScpMergeTarg
$(call gb_ScpMergeTarget_get_target,$(1)) : $(call
gb_ScpMergeTarget_get_source,$(1))
$(call gb_ScpMergeTarget_get_target,$(1)) :| $(dir $(call
gb_ScpMergeTarget_get_target,$(1))).dir
$(call gb_ScpMergeTarget_get_target,$(1)) : \
- SCP_POFILES := $(foreach
lang,$(gb_ScpMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)
+ SCP_POFILES := $(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)
$(call gb_ScpMergeTarget_get_target,$(1)) : \
- $(foreach
lang,$(gb_ScpMergeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po)
-$(foreach
lang,$(gb_ScpMergeTarget_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po) :
+ $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po)
+$(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po) :
endef
diff --git a/solenv/gbuild/UI.mk b/solenv/gbuild/UI.mk
index f46fb1d..4fdde7c 100644
--- a/solenv/gbuild/UI.mk
+++ b/solenv/gbuild/UI.mk
@@ -15,7 +15,6 @@ gb_UILocalizeTarget_WORKDIR := $(WORKDIR)/UILocalizeTarget
gb_UILocalizeTarget_TARGET := $(call gb_Executable_get_target_for_build,uiex)
gb_UILocalizeTarget_COMMAND := $(gb_Helper_set_ld_path)
$(gb_UILocalizeTarget_TARGET)
-gb_UILocalizeTarget_LANGS := $(filter-out qtz,$(filter-out
en-US,$(gb_WITH_LANG)))
# If translatable strings from a .ui file are not merged into the
# respective .po file yet, the produced translated files are empty (that
@@ -66,7 +65,7 @@ $(call gb_UILocalizeTarget_get_clean_target,%) :
#
# gb_UILocalizeTarget_UILocalizeTarget target
define gb_UILocalizeTarget_UILocalizeTarget
-$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(foreach
lang,$(gb_UILocalizeTarget_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst
%/,%,$(dir $(1))).po))
+$(call gb_UILocalizeTarget__UILocalizeTarget_impl,$(1),$(foreach
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir
$(1))).po))
endef
diff --git a/solenv/gbuild/extensions/pre_SharedLangList.mk
b/solenv/gbuild/extensions/pre_SharedLangList.mk
index 40c9467..e843b26 100644
--- a/solenv/gbuild/extensions/pre_SharedLangList.mk
+++ b/solenv/gbuild/extensions/pre_SharedLangList.mk
@@ -32,4 +32,6 @@ gb_WITH_LANG += qtz
endif
endif
+gb_TRANS_LANGS = $(filter-out en-US,$(filter-out qtz,$(gb_WITH_LANG)))
+
# vim: set noet ts=4 sw=4:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
