solenv/gbuild/UIConfig.mk | 3 +++ solenv/gbuild/extensions/post_PackageInfo.mk | 15 ++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)
New commits: commit f448777213bae4248cb330725cea0bc38dddc143 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Wed Nov 27 14:13:16 2013 +0100 add missing l10n config files Change-Id: Ia7e654cdeffd832f51016ff51aa180fe3924ff4e diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 9c1caec..22c6c45 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -59,11 +59,17 @@ define gb_PackageInfo_emit_l10n_for_one_uifile endef +define gb_PackageInfo_emit_l10n_for_one_configfile +echo "$(LIBO_SHARE_FOLDER)/registry/$(2)$(1).xcd" >> $(gb_PackageInfo_get_target)/l10n-$(1).files + +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_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))))) +$(if $(filter $(gb_Configuration_LANGS),$(1)),$(foreach configfile,Langpack- res/fcfg_langpack_ res/registry_,$(call gb_PackageInfo_emit_l10n_for_one_configfile,$(1),$(configfile)))) endef commit 95434a81c320717cd29c2aebc91a750c547f6c62 Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Wed Nov 27 13:50:08 2013 +0100 add uiconfig file translations Change-Id: I9bb39bdd677af4be0da621370c51eb9e22ecc33f diff --git a/solenv/gbuild/UIConfig.mk b/solenv/gbuild/UIConfig.mk index 657d362..07e6a13 100644 --- a/solenv/gbuild/UIConfig.mk +++ b/solenv/gbuild/UIConfig.mk @@ -305,12 +305,15 @@ $(call gb_UIConfig__add_translations,$(1),$(2),\ endef + +gb_UIConfig_ALLFILES:= # Adds .ui file to the package # # The file is relative to $(SRCDIR) and without extension. # # gb_UIConfig_add_uifile target uifile define gb_UIConfig_add_uifile +gb_UIConfig_ALLFILES+=$(1):$(notdir $(2)) $(call gb_UIConfig__add_uifile,$(1),$(2)) ifneq ($(gb_UIConfig_LANGS),) diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index c83b8c8..9c1caec 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -54,10 +54,16 @@ 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 + +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_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))))) endef commit cc7eb173a3b7faa81ea9dc1835f00df4375f5f4d Author: Bjoern Michaelsen <bjoern.michael...@canonical.com> Date: Wed Nov 27 01:22:59 2013 +0100 add missing help files in packageinfo Change-Id: Ia2498a118e729276a78ef3a4eb43b5d0b302d326 diff --git a/solenv/gbuild/extensions/post_PackageInfo.mk b/solenv/gbuild/extensions/post_PackageInfo.mk index 9fd49e7..c83b8c8 100644 --- a/solenv/gbuild/extensions/post_PackageInfo.mk +++ b/solenv/gbuild/extensions/post_PackageInfo.mk @@ -38,7 +38,8 @@ endef define gb_PackageInfo_emit_help_for_one_lang @touch $(foreach suf,executables libraries files,$(gb_PackageInfo_get_target)/help-$(1).$(suf)) -$(foreach target,$(filter-out shared,$(gb_AllLangHelp_ALLTARGETS)),$(call gb_PackageInfo_emit_help_for_one_target,$(1)/$(target),$(gb_PackageInfo_get_target)/help-$(1).files)) +$(foreach target,$(gb_AllLangHelp_ALLTARGETS),$(call gb_PackageInfo_emit_help_for_one_target,$(1)/$(target),$(gb_PackageInfo_get_target)/help-$(1).files)) +$(foreach suf,html css,$(foreach file,$(wildcard $(INSTDIR)/help/$(1)/*.$(suf)),echo "$(patsubst $(INSTDIR)/%,%,$(file))" >> $(gb_PackageInfo_get_target)/help-$(1).files && )) true endef _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits