Kaydet (Commit) 39a4ca40 authored tarafından Matúš Kukan's avatar Matúš Kukan

tdf#97803: gbuild: Check that resource targets are registered

And replace gb_AllLangResTarget_ALLTARGETS with
gb_AllLangResTarget_REGISTERED which should have
the same content and is already used.

This actually helped to find a problem, fixed in
52d409f0

Change-Id: Iae551d7be221c5655dee1bc9ad273c8822d45178
üst 4f7280e4
...@@ -329,9 +329,11 @@ $(call gb_AllLangResTarget_get_target,%) : ...@@ -329,9 +329,11 @@ $(call gb_AllLangResTarget_get_target,%) :
gb_ResTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res gb_ResTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res
gb_AllLangResTarget_ALLTARGETS :=
define gb_AllLangResTarget_AllLangResTarget define gb_AllLangResTarget_AllLangResTarget
gb_AllLangResTarget_ALLTARGETS += $(1) ifeq (,$$(filter $(1),$$(gb_AllLangResTarget_REGISTERED)))
$$(eval $$(call gb_Output_info,Currently known AllLangResTargets are: $(sort $(gb_AllLangResTarget_REGISTERED)),ALL))
$$(eval $$(call gb_Output_error,AllLangResTarget $(1) must be registered in Repository.mk))
endif
$(foreach lang,$(gb_AllLangResTarget_LANGS),\ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
$(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang))) $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang)))
......
...@@ -200,6 +200,10 @@ gb_UIConfig_get_zipname_for_lang = UIConfig/$(1)/$(2) ...@@ -200,6 +200,10 @@ gb_UIConfig_get_zipname_for_lang = UIConfig/$(1)/$(2)
# #
# gb_UIConfig_UIConfig modulename # gb_UIConfig_UIConfig modulename
define gb_UIConfig_UIConfig define gb_UIConfig_UIConfig
ifeq (,$$(filter $(1),$$(gb_UIConfig_REGISTERED)))
$$(eval $$(call gb_Output_info,Currently known UI configs are: $(sort $(gb_UIConfig_REGISTERED)),ALL))
$$(eval $$(call gb_Output_error,UIConfig $(1) must be registered in Repository.mk))
endif
$(call gb_UIConfig_get_imagelist_target,$(1)) : UI_IMAGELISTS := $(call gb_UIConfig_get_imagelist_target,$(1)) : UI_IMAGELISTS :=
$(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$(1))) $(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$(1)))
......
...@@ -72,7 +72,7 @@ endef ...@@ -72,7 +72,7 @@ endef
define gb_PackageInfo_emit_l10n_for_one_lang define gb_PackageInfo_emit_l10n_for_one_lang
@touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf))
$(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst %/,%,$(gb_AllLangPackage_ALLDIRS)),$(call gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1)))) $(if $(filter-out qtz en-US,$(1)),$(foreach packagedir,$(patsubst %/,%,$(gb_AllLangPackage_ALLDIRS)),$(call gb_PackageInfo_emit_l10n_for_one_alllangpackage,$(packagedir),$(1))))
$(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangResTarget_ALLTARGETS),$(call gb_PackageInfo_emit_l10n_for_one_resource,$(target),$(1)))) $(if $(filter $(gb_AllLangResTarget_LANGS),$(1)),$(foreach target,$(gb_AllLangResTarget_REGISTERED),$(call gb_PackageInfo_emit_l10n_for_one_resource,$(target),$(1))))
$(foreach uizip,\ $(foreach uizip,\
$(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst :,$(WHITESPACE),$(uifile))))),\ $(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst :,$(WHITESPACE),$(uifile))))),\
$(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip))) $(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment