[Libreoffice-commits] core.git: 2 commits - Repository.mk scp2/source solenv/gbuild

[Matúš Kukan]

 Repository.mk                                |    1 +
 scp2/source/ooo/file_ooo.scp                 |   11 -----------
 scp2/source/ooo/module_ooo.scp               |    1 -
 solenv/gbuild/AllLangResTarget.mk            |    6 ++++--
 solenv/gbuild/UIConfig.mk                    |    4 ++++
 solenv/gbuild/extensions/post_PackageInfo.mk |    2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 0b66adec8f3a3e03499d5a3cb1db7008a391e61e
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Thu Dec 1 14:47:31 2016 +0100

    tdf#90753: AutoInstall gengal with filelist feature
    
    Change-Id: Ic72fb18eccb54b24f4205d997585cee753965b10

diff --git a/Repository.mk b/Repository.mk
index 33bf6d0..bcf63d4 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -845,6 +845,7 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
 	package_dtd \
 	sd_web \
 	sfx2_emojiconfig \
+	$(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX WNT,$(OS)),svx_gengal)) \
 	$(if $(USING_X11),vcl_fontunxppds) \
 	$(if $(filter $(OS),MACOSX),vcl_osxres) \
 	xmloff_dtd \
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index df88a71..a3e5a67 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -27,17 +27,6 @@
 
 #include "macros.inc"
 
-#if defined UNX && !defined MACOSX
-
-File gid_File_Script_Gengal
-    BIN_FILE_BODY;
-    Dir = gid_Brand_Dir_Program;
-    Styles = (PACKED);
-    Name = "gengal";
-End
-
-#endif
-
 #if defined UNX && ! defined ENABLE_MACOSX_SANDBOX
 File gid_File_Bin_Senddoc
     BIN_FILE_BODY;
diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp
index 4287904..210f4e5 100644
--- a/scp2/source/ooo/module_ooo.scp
+++ b/scp2/source/ooo/module_ooo.scp
@@ -24,7 +24,6 @@ Module gid_Module_Root
     InstallOrder = "20";
     MOD_NAME_DESC(MODULE_ROOT_OSL);
     Files = (gid_File_Bin_Senddoc,
-             gid_File_Script_Gengal,
              gid_File_Txt_Pagein_Common,
              gid_File_Txt_Pagein_Calc,
              gid_File_Txt_Pagein_Draw,
commit 39a4ca4072059b707a5368d8d215249e06258032
Author: Matúš Kukan <matus.kukan at gmail.com>
Date:   Wed Nov 30 20:16:12 2016 +0100

    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

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 905fee4..3462a54 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 7f81418..55446a3 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 b3d3cfc..1b05e9c 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)))