install UI config. files using filelists

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

5 files changed, 159 insertions, 17 deletions

diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index a1bb2d016236..839e88557461 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/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 \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 6236c7cc08a6..3d341de7e179 100755
--- a/scp2/inc/macros.inc
+++ b/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
 
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index dab412ca5d8e..93f89232d41f 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/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
 
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3e05820be4be..7b661765af35 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/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,
diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp
index 02f733ce6f0d..328e8a53dc38 100644
--- a/scp2/source/ooo/module_lang_template.scp
+++ b/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,