diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-11-30 20:16:12 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-01 17:07:54 +0100 |
| commit | 39a4ca4072059b707a5368d8d215249e06258032 (patch) | |
| tree | a14cfc185bdd9963b807d15ae631323c5c2a8faf | |
| parent | 4f7280e4cc34a284b91473cefcb179f04a1d7a08 (diff) | |
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
52d409f0d657f314a53f945c9ffb5b8025bea034
Change-Id: Iae551d7be221c5655dee1bc9ad273c8822d45178
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 4 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_PackageInfo.mk | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 905fee435071..3462a54b586c 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -329,9 +329,11 @@ $(call gb_AllLangResTarget_get_target,%) : gb_ResTarget_get_install_target = $(INSTROOT)/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res -gb_AllLangResTarget_ALLTARGETS := 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),\ $(call gb_ResTarget_ResTarget,$(1)$(lang),$(1),$(lang))) diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 7f814188951e..55446a31851d 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -200,6 +200,10 @@ gb_UIConfig_get_zipname_for_lang = UIConfig/$(1)/$(2) # # gb_UIConfig_UIConfig modulename 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_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$(1))) diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index b3d3cfcb6381..1b05e9cc6a74 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -72,7 +72,7 @@ endef define gb_PackageInfo_emit_l10n_for_one_lang @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 $(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,\ $(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst :,$(WHITESPACE),$(uifile))))),\ $(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip))) |