install UI config. files using filelists

Change-Id: I422c8912bc2557c2c03bb885e5c193deb93d1d5e
Reviewed-on: https://gerrit.libreoffice.org/3233Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

postprocess/CustomTarget_config.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_CustomTarget_CustomTarget,postprocess/config))
-
-$(eval $(call gb_CustomTarget_register_targets,postprocess/config,\
-	uiconfig.zip \
-))
-
-.PHONY: $(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-
-# We need this dependency for delivering in package postprocess_config:
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig_%.zip : \
-		$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip
-	@true
-
-$(call gb_CustomTarget_get_workdir,postprocess/config)/uiconfig.zip : \
-		$(SRCDIR)/postprocess/packconfig/packconfig.pl \
-		$(call gb_Postprocess_get_target,AllPackages) \
-		$(call gb_Postprocess_get_target,AllUIs)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
-	cd $(SRCDIR)/postprocess/packconfig \
-	&& $(PERL) packconfig.pl -i $(OUTDIR)/xml/uiconfig -o $(dir $@)
-
-# vim: set noet sw=4 ts=4:

postprocess/CustomTarget_images.mk

@@ -87,9 +87,9 @@ $(packimages_DIR)/commandimagelist.ilst :
 
 $(packimages_DIR)/sorted.lst : \
 		$(SRCDIR)/postprocess/packimages/image-sort.lst \
-		$(call gb_Postprocess_get_target,AllPackages)
+		$(call gb_Postprocess_get_target,AllUIConfigs)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
-		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)
+		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(INSTDIR)/$(gb_UIConfig_INSTDIR) $@)
 
 # vim: set noet sw=4 ts=4:

postprocess/Module_postprocess.mk

@@ -13,10 +13,8 @@ $(eval $(call gb_Module_Module,postprocess))
 # is reused in Package_registry!
 
 $(eval $(call gb_Module_add_targets,postprocess,\
-	CustomTarget_config \
 	CustomTarget_images \
 	CustomTarget_registry \
-	Package_config \
 	Package_images \
 	Package_registry \
 	Rdb_services \

postprocess/Package_config.mk

-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Package_Package,postprocess_config,$(call gb_CustomTarget_get_workdir,postprocess/config)))
-
-$(eval $(call gb_Package_add_file,postprocess_config,bin/uiconfig.zip,uiconfig.zip))
-
-$(eval $(call gb_Package_add_files,postprocess_config,bin,\
-	$(foreach lang,$(filter-out en-US,$(gb_WITH_LANG)),uiconfig_$(lang).zip) \
-))
-
-# vim: set noet sw=4 ts=4:

scp2/InstallModule_ooo.mk

@@ -106,6 +106,18 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	) \
 ))
 
+ifeq ($(GUIBASE),unx)
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DGUIBASE_UNX \
+))
+endif
+
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
+	-DDBCONNECTIVITY \
+))
+endif
+
 ifeq ($(DISABLE_PYTHON),TRUE)
 $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
 	-DDISABLE_PYUNO \

scp2/inc/macros.inc

@@ -437,8 +437,23 @@ End
 #endif
 #endif
 
+#define UI_FILELIST(name, file) \
+    File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
+        TXT_FILE_BODY; \
+        Styles = (FILELIST); \
+        Dir = FILELIST_DIR; \
+        Name = file; \
+    End
+
 #include <langmacros.inc>
 
+#define UI_FILELIST_ALL_LANG(name, file, ext) \
+    File CONCAT3(gid_File_Share_Config_Sofficecfg_uiconfig_, name, _Lang) \
+        TXT_FILE_BODY; \
+        Styles = (FILELIST); \
+        Dir = FILELIST_DIR; \
+        EXTRA_ALL_LANG_BUT_EN_US(file, ext); \
+    End
 
 #endif // MACROS_INC
 

scp2/source/ooo/file_ooo.scp

@@ -771,21 +771,72 @@ End
 #endif
 
 // user interface configuration files
-File gid_File_Share_Config_Sofficecfg_uiconfig_Zip
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = gid_Dir_Share_Config_Sofficecfg;
-    Name = "uiconfig.zip";
-    Patchfiles = ();
-End
-
-// user interface configuration file translations
-File gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang
-    TXT_FILE_BODY;
-    Styles = (ARCHIVE);
-    Dir = gid_Dir_Share_Config_Sofficecfg;
-    EXTRA_ALL_LANG_BUT_EN_US(uiconfig,zip);
-End
+UI_FILELIST(basicide, "UIConfig/modules/BasicIDE.filelist")
+UI_FILELIST(cui, "UIConfig/cui.filelist")
+#ifdef DBCONNECTIVITY
+UI_FILELIST(dbaccess, "UIConfig/dbaccess.filelist")
+UI_FILELIST(dbapp, "UIConfig/modules/dbapp.filelist")
+UI_FILELIST(dbbrowser, "UIConfig/modules/dbbrowser.filelist")
+UI_FILELIST(dbquery, "UIConfig/modules/dbquery.filelist")
+UI_FILELIST(dbrelation, "UIConfig/modules/dbrelation.filelist")
+UI_FILELIST(dbreport, "UIConfig/modules/dbreport.filelist")
+UI_FILELIST(dbtable, "UIConfig/modules/dbtable.filelist")
+UI_FILELIST(dbtdata, "UIConfig/modules/dbtdata.filelist")
+#endif
+UI_FILELIST(desktop, "UIConfig/desktop.filelist")
+UI_FILELIST(filter, "UIConfig/filter.filelist")
+#ifdef DBCONNECTIVITY
+UI_FILELIST(sbibliography, "UIConfig/modules/sbibliography.filelist")
+#endif
+UI_FILELIST(scalc, "UIConfig/modules/scalc.filelist")
+UI_FILELIST(schart, "UIConfig/modules/schart.filelist")
+UI_FILELIST(sdraw, "UIConfig/modules/sdraw.filelist")
+UI_FILELIST(sfx, "UIConfig/sfx.filelist")
+UI_FILELIST(sglobal, "UIConfig/modules/sglobal.filelist")
+UI_FILELIST(simpress, "UIConfig/modules/simpress.filelist")
+UI_FILELIST(smath, "UIConfig/modules/smath.filelist")
+#ifdef GUIBASE_UNX
+UI_FILELIST(spa, "UIConfig/spa.filelist")
+#endif
+UI_FILELIST(startmodule, "UIConfig/modules/StartModule.filelist")
+UI_FILELIST(svt, "UIConfig/svt.filelist")
+UI_FILELIST(svx, "UIConfig/svx.filelist")
+UI_FILELIST(sweb, "UIConfig/modules/sweb.filelist")
+UI_FILELIST(swform, "UIConfig/modules/swform.filelist")
+UI_FILELIST(swreport, "UIConfig/modules/swreport.filelist")
+UI_FILELIST(swriter, "UIConfig/modules/swriter.filelist")
+UI_FILELIST(swxform, "UIConfig/modules/swxform.filelist")
+#ifdef ENABLE_TELEPATHY
+UI_FILELIST(tubes, "UIConfig/tubes.filelist")
+#endif
+UI_FILELIST(uui, "UIConfig/uui.filelist")
+UI_FILELIST(vcl, "UIConfig/vcl.filelist")
+UI_FILELIST(xmlsec, "UIConfig/xmlsec.filelist")
+
+UI_FILELIST_ALL_LANG(basicide, UIConfig/modules/BasicIDE, filelist)
+UI_FILELIST_ALL_LANG(cui, UIConfig/cui, filelist)
+#ifdef DBCONNECTIVITY
+UI_FILELIST_ALL_LANG(dbaccess, UIConfig/dbaccess, filelist)
+#endif
+UI_FILELIST_ALL_LANG(desktop, UIConfig/desktop, filelist)
+UI_FILELIST_ALL_LANG(filter, UIConfig/filter, filelist)
+UI_FILELIST_ALL_LANG(scalc, UIConfig/modules/scalc, filelist)
+UI_FILELIST_ALL_LANG(schart, UIConfig/modules/schart, filelist)
+UI_FILELIST_ALL_LANG(sdraw, UIConfig/modules/sdraw, filelist)
+UI_FILELIST_ALL_LANG(sfx, UIConfig/sfx, filelist)
+UI_FILELIST_ALL_LANG(simpress, UIConfig/modules/simpress, filelist)
+UI_FILELIST_ALL_LANG(smath, UIConfig/modules/smath, filelist)
+#ifdef GUIBASE_UNX
+UI_FILELIST_ALL_LANG(spa, UIConfig/spa, filelist)
+#endif
+UI_FILELIST_ALL_LANG(svt, UIConfig/svt, filelist)
+UI_FILELIST_ALL_LANG(svx, UIConfig/svx, filelist)
+#ifdef ENABLE_TELEPATHY
+UI_FILELIST_ALL_LANG(tubes, UIConfig/tubes, filelist)
+#endif
+UI_FILELIST_ALL_LANG(uui, UIConfig/uui, filelist)
+UI_FILELIST_ALL_LANG(vcl, UIConfig/vcl, filelist)
+UI_FILELIST_ALL_LANG(xmlsec, UIConfig/xmlsec, filelist)
 
 #ifdef WNT
 

scp2/source/ooo/module_hidden_ooo.scp

@@ -497,7 +497,47 @@ Module gid_Module_Root_Files_6
 	gid_File_Extra_Glas_Red_Zip,
 	gid_File_Extra_Glas_Green_Zip,
 	gid_File_Extra_Glas_Blue_Zip,
-	gid_File_Share_Config_Sofficecfg_uiconfig_Zip,
+        gid_File_Share_Config_Sofficecfg_uiconfig_basicide,
+        gid_File_Share_Config_Sofficecfg_uiconfig_cui,
+#ifdef DBCONNECTIVITY
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbapp,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbbrowser,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbquery,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbrelation,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbreport,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbtable,
+        gid_File_Share_Config_Sofficecfg_uiconfig_dbtdata,
+#endif
+        gid_File_Share_Config_Sofficecfg_uiconfig_desktop,
+        gid_File_Share_Config_Sofficecfg_uiconfig_filter,
+#ifdef DBCONNECTIVITY
+        gid_File_Share_Config_Sofficecfg_uiconfig_sbibliography,
+#endif
+        gid_File_Share_Config_Sofficecfg_uiconfig_scalc,
+        gid_File_Share_Config_Sofficecfg_uiconfig_schart,
+        gid_File_Share_Config_Sofficecfg_uiconfig_sdraw,
+        gid_File_Share_Config_Sofficecfg_uiconfig_sfx,
+        gid_File_Share_Config_Sofficecfg_uiconfig_sglobal,
+        gid_File_Share_Config_Sofficecfg_uiconfig_simpress,
+        gid_File_Share_Config_Sofficecfg_uiconfig_smath,
+#ifdef GUIBASE_UNX
+        gid_File_Share_Config_Sofficecfg_uiconfig_spa,
+#endif
+        gid_File_Share_Config_Sofficecfg_uiconfig_startmodule,
+        gid_File_Share_Config_Sofficecfg_uiconfig_svt,
+        gid_File_Share_Config_Sofficecfg_uiconfig_svx,
+        gid_File_Share_Config_Sofficecfg_uiconfig_sweb,
+        gid_File_Share_Config_Sofficecfg_uiconfig_swform,
+        gid_File_Share_Config_Sofficecfg_uiconfig_swreport,
+        gid_File_Share_Config_Sofficecfg_uiconfig_swriter,
+        gid_File_Share_Config_Sofficecfg_uiconfig_swxform,
+#ifdef ENABLE_TELEPATHY
+        gid_File_Share_Config_Sofficecfg_uiconfig_tubes,
+#endif
+        gid_File_Share_Config_Sofficecfg_uiconfig_uui,
+        gid_File_Share_Config_Sofficecfg_uiconfig_vcl,
+        gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec,
 	gid_File_Dtd_Accelerator,
 	gid_File_Dtd_Dialog,
 	gid_File_Dtd_Event,

scp2/source/ooo/module_lang_template.scp

@@ -30,7 +30,31 @@ Module gid_Module_Langpack_Basis_Template
     Name = "gid_Module_Langpack_Root_Template";
     Description = "gid_Module_Langpack_Root_Template";
     Styles = (TEMPLATEMODULE);
-    Files = (gid_File_Share_Config_Sofficecfg_uiconfig_Zip_Lang,
+    Files = (
+             gid_File_Share_Config_Sofficecfg_uiconfig_basicide_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_cui_Lang,
+#ifdef DBCONNECTIVITY
+             gid_File_Share_Config_Sofficecfg_uiconfig_dbaccess_Lang,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_desktop_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_filter_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_scalc_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_schart_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sdraw_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_sfx_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_simpress_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_smath_Lang,
+#ifdef GUIBASE_UNX
+             gid_File_Share_Config_Sofficecfg_uiconfig_spa_Lang,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_svt_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_svx_Lang,
+#ifdef ENABLE_TELEPATHY
+             gid_File_Share_Config_Sofficecfg_uiconfig_tubes_Lang,
+#endif
+             gid_File_Share_Config_Sofficecfg_uiconfig_uui_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_vcl_Lang,
+             gid_File_Share_Config_Sofficecfg_uiconfig_xmlsec_Lang,
              gid_File_Extra_Autotextshare_Lang,
              gid_File_Registry_Filter_Zip,
              gid_File_Registry_Lang,

solenv/gbuild/UIConfig.mk

@@ -124,6 +124,7 @@ endef
 #   of .ui files. This filelist only exists if the UIConfig contains any
 #   .ui files.
 
+gb_UIConfig_INSTDIR := share/config/soffice.cfg
 # en-US is the default, so there is no translation for it
 gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
@@ -158,6 +159,8 @@ $(call gb_PackageSet_PackageSet_internal,$(call gb_UIConfig_get_packagesetname,$
 $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)),$(SRCDIR))
 $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename,$(1)_generated),$(WORKDIR))
 
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)),$(INSTDIR))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename,$(1)_generated),$(INSTDIR))
 $(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)))
 
 $(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir
@@ -176,6 +179,7 @@ endef
 
 define gb_UIConfig__UIConfig_for_lang
 $(call gb_Package_Package_internal,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(gb_UILocalizeTarget_WORKDIR))
+$(call gb_Package_set_outdir,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)),$(INSTDIR))
 $(call gb_UIConfig_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
 $(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_UIConfig_get_packagename_for_lang,$(1),$(2)))
 
@@ -183,7 +187,7 @@ endef
 
 # gb_UIConfig__package_file target package type destfile srcfile
 define gb_UIConfig__package_file
-$(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/$(3)/$(4),$(5))
+$(call gb_Package_add_file,$(2),$(gb_UIConfig_INSTDIR)/$(1)/$(3)/$(4),$(5))
 
 endef
 
@@ -277,7 +281,7 @@ endef
 
 define gb_UIConfig__add_menubarfile
 $(call gb_UIMenubarTarget_UIMenubarTarget,$(2),$(3))
-$(call gb_Package_add_file,$(call gb_UIConfig_get_packagename,$(1)_generated),xml/uiconfig/$(1)/menubar/$(notdir $(2)).xml,$(subst $(WORKDIR)/,,$(call gb_UIMenubarTarget_get_target,$(2))))
+$(call gb_Package_add_file,$(call gb_UIConfig_get_packagename,$(1)_generated),$(gb_UIConfig_INSTDIR)/$(1)/menubar/$(notdir $(2)).xml,$(subst $(WORKDIR)/,,$(call gb_UIMenubarTarget_get_target,$(2))))
 $(call gb_PackageSet_add_package,$(call gb_UIConfig_get_packagesetname,$(1)),$(call gb_UIConfig_get_packagename,$(1)_generated))
 
 $(call gb_Package_get_target,$(call gb_UIConfig_get_packagename,$(1)_generated)) : $(call gb_UIMenubarTarget_get_target,$(2))
@@ -291,7 +295,7 @@ endef
 #
 # gb_UIConfig_add_menubarfile target file
 define gb_UIConfig_add_menubarfile
-$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(SRCDIR)/$(2).xml)
+$(call gb_UIConfig__add_menubarfile,$(1),$(gb_UIConfig_INSTDIR)/$(1)/menubar/$(notdir $(2)),$(SRCDIR)/$(2).xml)
 
 endef
 
@@ -309,7 +313,7 @@ endef
 #
 # gb_UIConfig_add_generated_menubarfile target file
 define gb_UIConfig_add_generated_menubarfile
-$(call gb_UIConfig__add_menubarfile,$(1),$(2),$(WORKDIR)/$(2).xml)
+$(call gb_UIConfig__add_menubarfile,$(1),$(gb_UIConfig_INSTDIR)/$(1)/menubar/$(notdir $(2)),$(WORKDIR)/$(2).xml)
 
 endef