diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-02-04 17:42:03 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2014-02-10 16:39:54 +0100 |
| commit | 289ced4011a2866fcf59b86c7cf9a89c924882cc (patch) | |
| tree | 051f3b961a820084731755e91dba830e95a55978 /solenv | |
| parent | eddcfe55f1fc995f88756c2fdc99321ef48c5188 (diff) | |
adjust PackageInfo for zip files
see commit 7fe9808f009af2f0a4da58663eacd2caccdcaafe for reference
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/extensions/post_PackageInfo.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 0063e88d8a43..e4bbd144cc31 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -58,8 +58,8 @@ define gb_PackageInfo_emit_l10n_for_one_ressource endef -define gb_PackageInfo_emit_l10n_for_one_uifile -@echo "$(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1)/$(3)" >> $(gb_PackageInfo_get_target)/l10n-$(1).files +define gb_PackageInfo_emit_l10n_for_one_uizip +@echo "$(gb_UIConfig_INSTDIR)/$(2)/ui/res/$(1).zip" >> $(gb_PackageInfo_get_target)/l10n-$(1).files endef @@ -72,7 +72,9 @@ 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_ressource,$(target),$(1)))) -$(foreach uifile,$(gb_UIConfig_ALLFILES),$(call gb_PackageInfo_emit_l10n_for_one_uifile,$(1),$(firstword $(subst :,$(WHITESPACE),$(uifile))),$(lastword $(subst :,$(WHITESPACE),$(uifile))))) +$(foreach uizip,\ + $(sort $(foreach uifile,$(gb_UIConfig_ALLFILES),$(firstword $(subst :,$(WHITESPACE),$(uifile))))),\ + $(call gb_PackageInfo_emit_l10n_for_one_uizip,$(1),$(uizip))) $(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- res/fcfg_langpack_ res/registry_,$(call gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile)))) @echo "$(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/l10n-$(1).$(suf)) \\" >> $(WORKDIR)/Dep/packageinfo.d |