diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-07-18 17:47:43 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-07-18 17:50:39 +0200 |
| commit | baefe3a7251c25c7b5c83c7e75dc79970d6bbfc0 (patch) | |
| tree | 4725203d9631ed38ff5397b79480e8457951b2a9 /solenv/gbuild/UIConfig.mk | |
| parent | scp2: move pdfimport library to AutoInstall (diff) | |
| download | core-baefe3a7251c25c7b5c83c7e75dc79970d6bbfc0.tar.gz core-baefe3a7251c25c7b5c83c7e75dc79970d6bbfc0.zip | |
gbuild: fix build of installation set with missing .ui translations
As demonstrated by commit b875362cd576b29aee4da899335b8d8f6c74d192,
scp2 will reference all languages' UIConfig zip file, but gbuild only
builds those that have existing input files from translations;
tweak UIConfig class to always build a zip file, and the Zip command to
work with no inputs as well, which requires a little hack.
Change-Id: If6dbb07aa856c94802b9abdcaa20ba03e59d37fa
Diffstat (limited to 'solenv/gbuild/UIConfig.mk')
| -rw-r--r-- | solenv/gbuild/UIConfig.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 7fdb7e1d8152..0946925cbca6 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -225,6 +225,8 @@ $(call gb_Postprocess_register_target,AllUIConfigs,UIConfig,$(1)) endef define gb_UIConfig__UIConfig_for_lang +$(call gb_UIConfig_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) +$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) $(call gb_Zip_Zip_internal,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR)/$(1)) $(call gb_Zip_add_commandoptions,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2)),--suffixes .ui) $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(2))) : $(SRCDIR)/solenv/gbuild/UIConfig.mk @@ -258,8 +260,6 @@ endef # # gb_UIConfig__add_uifile_for_lang target file lang define gb_UIConfig__add_uifile_for_lang -$(call gb_UIConfig_get_target,$(1)) : $(call gb_Zip_get_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3))) -$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Zip_get_clean_target,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3))) $(call gb_Zip_add_file,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(notdir $(2))/$(3).ui) $(call gb_Zip_add_dependency,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(call gb_UILocalizeTarget_get_target,$(1)/$(notdir $(2)))) $(call gb_Zip_set_install_name,$(call gb_UIConfig_get_zipname_for_lang,$(1),$(3)),$(INSTROOT)/$(gb_UIConfig_INSTDIR)/$(1)/ui/res/$(3).zip) |