[Libreoffice-commits] core.git: 6 commits - Repository.mk scp2/AutoInstall.mk scp2/inc scp2/InstallModule_ooo.mk scp2/InstallModule_sdkoo.mk scp2/InstallModule_winexplorerext.mk scp2/source solenv/bin solenv/gbuild
Michael Stahl
mstahl at redhat.com
Fri Jun 2 14:37:45 UTC 2017
Repository.mk | 31 +++-
scp2/AutoInstall.mk | 55 ++++----
scp2/InstallModule_ooo.mk | 2
scp2/InstallModule_sdkoo.mk | 4
scp2/InstallModule_winexplorerext.mk | 4
scp2/inc/macros.inc | 49 +++----
scp2/source/base/registryitem_base.scp | 2
scp2/source/calc/registryitem_calc.scp | 8 -
scp2/source/draw/registryitem_draw.scp | 9 -
scp2/source/impress/registryitem_impress.scp | 9 -
scp2/source/math/registryitem_math.scp | 4
scp2/source/ooo/file_font_ooo.scp | 81 -------------
scp2/source/ooo/module_hidden_ooo.scp | 16 --
scp2/source/winexplorerext/module_winexplorerext.scp | 4
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 14 --
scp2/source/writer/registryitem_writer.scp | 15 --
solenv/bin/modules/installer/globals.pm | 1
solenv/bin/modules/installer/windows/component.pm | 3
solenv/bin/modules/installer/windows/registry.pm | 3
solenv/gbuild/AutoInstall.mk | 6
solenv/gbuild/gen-autoinstall.py | 25 +++-
21 files changed, 99 insertions(+), 246 deletions(-)
New commits:
commit 4f56da239de91cc1a1fdf3138bad5fff86b2bf96
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 16:05:55 2017 +0200
scp2: remove all ComponentConditions that test Windows versions
Windows 7 (6.01) has all the features we want.
Change-Id: I96356b2decb26af526bceda8081875d418f17274
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index fc17096b7f48..41c1040edd09 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -294,7 +294,6 @@ End
RegistryItem CONCAT3(gid_Regitem_Openoffice_,name,_AppUserModelID) \
ParentID = PREDEFINED_HKEY_CLASSES_ROOT; \
ModuleID = modid; \
- ComponentCondition = STRING(VersionNT >= 601); \
Subkey = STRING(CONCAT2(LibreOffice.,name)); \
Name = STRING(AppUserModelID); \
Value = STRING(CONCAT2(TheDocumentFoundation.LibreOffice.,doc_type)); \
@@ -435,7 +434,6 @@ End
RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
ModuleID = gid_Module_Optional_Winexplorerext; \
- ComponentCondition = "VersionNT >= 600"; \
Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End \
@@ -443,7 +441,7 @@ End
RegistryItem CONCAT3(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension,_x64) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
ModuleID = gid_Module_Optional_Winexplorerext_x64; \
- ComponentCondition = "VersionNT64 >= 600"; \
+ ComponentCondition = "VersionNT64"; \
Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End
@@ -454,7 +452,6 @@ End
RegistryItem CONCAT2(gid_Regitem_Software_Microsoft_Windows_CurrentVersion_PropertySystem_PropertyHandlers_,extension) \
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE; \
ModuleID = gid_Module_Optional_Winexplorerext; \
- ComponentCondition = "VersionNT >= 600"; \
Subkey = STRING(CONCAT2(SOFTWARE\Microsoft\Windows\CurrentVersion\PropertySystem\PropertyHandlers\.,extension)); \
Value = "{AE424E85-F6DF-4910-A6A9-438797986431}"; \
End
diff --git a/scp2/source/base/registryitem_base.scp b/scp2/source/base/registryitem_base.scp
index 69bf1d055f3e..ee7932ccd451 100644
--- a/scp2/source/base/registryitem_base.scp
+++ b/scp2/source/base/registryitem_base.scp
@@ -81,7 +81,6 @@ End
RegistryItem gid_Regitem_Openoffice_Databasedocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Base_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DatabaseDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Base";
@@ -108,7 +107,6 @@ End
RegistryItem gid_Regitem_odb_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Base_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odb";
Value = "document";
diff --git a/scp2/source/calc/registryitem_calc.scp b/scp2/source/calc/registryitem_calc.scp
index e660c41c5983..b79f1665fe46 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -280,7 +280,6 @@ End
RegistryItem gid_Regitem_Soffice_Starcalcdocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarCalcDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -394,7 +393,6 @@ End
RegistryItem gid_Regitem_Soffice_Starcalctemplate_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarCalcTemplate.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -534,7 +532,6 @@ End
RegistryItem gid_Regitem_stc_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".stc";
Value = "document";
@@ -701,7 +698,6 @@ End
RegistryItem gid_Regitem_Openoffice_Calcdocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.CalcDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -728,7 +724,6 @@ End
RegistryItem gid_Regitem_ods_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".ods";
Value = "document";
@@ -839,7 +834,6 @@ End
RegistryItem gid_Regitem_fods_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".fods";
Value = "document";
@@ -907,7 +901,6 @@ End
RegistryItem gid_Regitem_Openoffice_Calctemplate_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.CalcTemplate.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Calc";
@@ -934,7 +927,6 @@ End
RegistryItem gid_Regitem_ots_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Calc_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".ots";
Value = "document";
diff --git a/scp2/source/draw/registryitem_draw.scp b/scp2/source/draw/registryitem_draw.scp
index c33b9026433e..ffa97849da03 100644
--- a/scp2/source/draw/registryitem_draw.scp
+++ b/scp2/source/draw/registryitem_draw.scp
@@ -280,7 +280,6 @@ End
RegistryItem gid_Regitem_Soffice_Stardrawdocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarDrawDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -394,7 +393,6 @@ End
RegistryItem gid_Regitem_Soffice_Stardrawtemplate_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarDrawTemplate.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -506,7 +504,6 @@ End
RegistryItem gid_Regitem_std_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".std";
Value = "document";
@@ -585,7 +582,6 @@ End
RegistryItem gid_Regitem_sxd_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sxd";
Value = "document";
@@ -701,7 +697,6 @@ End
RegistryItem gid_Regitem_Openoffice_Drawdocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DrawDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -728,7 +723,6 @@ End
RegistryItem gid_Regitem_odg_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odg";
Value = "document";
@@ -839,7 +833,6 @@ End
RegistryItem gid_Regitem_fodg_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".fodg";
Value = "document";
@@ -907,7 +900,6 @@ End
RegistryItem gid_Regitem_Openoffice_Drawtemplate_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.DrawTemplate.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Draw";
@@ -934,7 +926,6 @@ End
RegistryItem gid_Regitem_otg_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Draw_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".otg";
Value = "document";
diff --git a/scp2/source/impress/registryitem_impress.scp b/scp2/source/impress/registryitem_impress.scp
index fdaef6c39528..d236715e6a81 100644
--- a/scp2/source/impress/registryitem_impress.scp
+++ b/scp2/source/impress/registryitem_impress.scp
@@ -280,7 +280,6 @@ End
RegistryItem gid_Regitem_Soffice_Starimpressdocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarImpressDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -408,7 +407,6 @@ End
RegistryItem gid_Regitem_Soffice_Starimpresstemplate_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarImpressTemplate.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -520,7 +518,6 @@ End
RegistryItem gid_Regitem_sti_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sti";
Value = "document";
@@ -599,7 +596,6 @@ End
RegistryItem gid_Regitem_sxi_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sxi";
Value = "document";
@@ -716,7 +712,6 @@ End
RegistryItem gid_Regitem_Openoffice_Impressdocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.ImpressDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -743,7 +738,6 @@ End
RegistryItem gid_Regitem_odp_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odp";
Value = "document";
@@ -868,7 +862,6 @@ End
RegistryItem gid_Regitem_fodp_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".fodp";
Value = "document";
@@ -936,7 +929,6 @@ End
RegistryItem gid_Regitem_Openoffice_Impresstemplate_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.ImpressTemplate.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Impress";
@@ -963,7 +955,6 @@ End
RegistryItem gid_Regitem_otp_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Impress_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".otp";
Value = "document";
diff --git a/scp2/source/math/registryitem_math.scp b/scp2/source/math/registryitem_math.scp
index aa39a037779e..5ed9ae238b19 100644
--- a/scp2/source/math/registryitem_math.scp
+++ b/scp2/source/math/registryitem_math.scp
@@ -279,7 +279,6 @@ End
RegistryItem gid_Regitem_Soffice_Starmathdocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarMathDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Math";
@@ -449,7 +448,6 @@ End
RegistryItem gid_Regitem_sxm_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Math_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sxm";
Value = "document";
@@ -557,7 +555,6 @@ End
RegistryItem gid_Regitem_Openoffice_Mathdocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Math_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.MathDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Math";
@@ -584,7 +581,6 @@ End
RegistryItem gid_Regitem_odf_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Math_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odf";
Value = "document";
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 38a09fd42192..c144160f8391 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -405,7 +405,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
- ComponentCondition = "VersionNT >= 600";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
Value = "%PRODUCTNAME Property Handler";
End
@@ -413,7 +412,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
- ComponentCondition = "VersionNT >= 600";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
Name = "EnableShareDenyNone";
Value = "#1";
@@ -424,7 +422,7 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_PropHdl_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
- ComponentCondition = "VersionNT64 >= 600";
+ ComponentCondition = "VersionNT64";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
Value = "%PRODUCTNAME Property Handler";
End
@@ -432,7 +430,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_EnableShareDenyWrite_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
- ComponentCondition = "VersionNT >= 600";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}";
Name = "EnableShareDenyNone";
Value = "#1";
@@ -443,7 +440,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
- ComponentCondition = "VersionNT >= 600";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
End
@@ -453,7 +449,7 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
- ComponentCondition = "VersionNT64 >= 600";
+ ComponentCondition = "VersionNT64";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
End
@@ -463,7 +459,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext;
- ComponentCondition = "VersionNT >= 600";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
Name = "ThreadingModel";
Value = "Apartment";
@@ -474,7 +469,7 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_TM_x64
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
- ComponentCondition = "VersionNT64 >= 600";
+ ComponentCondition = "VersionNT64";
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
Name = "ThreadingModel";
Value = "Apartment";
@@ -485,7 +480,6 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Optional_Winexplorerext;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
Value = "%PRODUCTNAME Property Handler";
@@ -496,7 +490,7 @@ End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_Approved_x64
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Optional_Winexplorerext_x64;
- ComponentCondition = "VersionNT64 >= 600";
+ ComponentCondition = "VersionNT64";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Shell Extensions\Approved";
Name = "{AE424E85-F6DF-4910-A6A9-438797986431}";
Value = "%PRODUCTNAME Property Handler";
diff --git a/scp2/source/writer/registryitem_writer.scp b/scp2/source/writer/registryitem_writer.scp
index 71a06fc0a586..e91a50876557 100644
--- a/scp2/source/writer/registryitem_writer.scp
+++ b/scp2/source/writer/registryitem_writer.scp
@@ -280,7 +280,6 @@ End
RegistryItem gid_Regitem_Soffice_Starwriterdocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -401,7 +400,6 @@ End
RegistryItem gid_Regitem_Soffice_Starwriterglobaldocument_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterGlobalDocument.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -488,7 +486,6 @@ End
RegistryItem gid_Regitem_Soffice_Starwritertemplate_6_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "soffice.StarWriterTemplate.6";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -593,7 +590,6 @@ End
RegistryItem gid_Regitem_stw_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".stw";
Value = "document";
@@ -656,7 +652,6 @@ End
RegistryItem gid_Regitem_sxg_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sxg";
Value = "document";
@@ -735,7 +730,6 @@ End
RegistryItem gid_Regitem_sxw_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".sxw";
Value = "document";
@@ -851,7 +845,6 @@ End
RegistryItem gid_Regitem_Openoffice_Writerdocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -884,7 +877,6 @@ End
RegistryItem gid_Regitem_odt_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odt";
Value = "document";
@@ -1012,7 +1004,6 @@ End
RegistryItem gid_Regitem_fodt_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".fodt";
Value = "document";
@@ -1088,7 +1079,6 @@ End
RegistryItem gid_Regitem_Openoffice_Writertemplate_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterTemplate.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1115,7 +1105,6 @@ End
RegistryItem gid_Regitem_ott_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".ott";
Value = "document";
@@ -1240,7 +1229,6 @@ End
RegistryItem gid_Regitem_Openoffice_Writerglobaldocument_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterGlobalDocument.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1267,7 +1255,6 @@ End
RegistryItem gid_Regitem_odm_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".odm";
Value = "document";
@@ -1392,7 +1379,6 @@ End
RegistryItem gid_Regitem_Openoffice_WriterWebTemplate_1_AppUserModelID
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 601";
Subkey = "LibreOffice.WriterWebTemplate.1";
Name = "AppUserModelID";
Value = "TheDocumentFoundation.LibreOffice.Writer";
@@ -1461,7 +1447,6 @@ End
RegistryItem gid_Regitem_oth_KindMap
ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
ModuleID = gid_Module_Prg_Wrt_Bin;
- ComponentCondition = "VersionNT >= 600";
Subkey = "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\KindMap";
Name = ".oth";
Value = "document";
commit 8dac2cc0b93d51e9b3fff652ed1f2f4730b5c1c2
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 15:55:31 2017 +0200
scp2: merge explorer extension modules
Don't need to check the Windows version any more.
Change-Id: I774e68b6b3a07684e60532f9d76b9af6d2ea28cf
diff --git a/Repository.mk b/Repository.mk
index 3e8fccfcdc36..eb3696fe239e 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -682,20 +682,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,winexplorer
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerext, \
ooofilt \
- shlxthdl \
-))
-
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextnt6, \
propertyhdl \
+ shlxthdl \
))
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64, \
ooofilt_x64 \
- shlxthdl_x64 \
-))
-
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_SHLXTHDL,winexplorerextwin64nt6, \
propertyhdl_x64 \
+ shlxthdl_x64 \
))
endif # WNT
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index bc9731878ee3..413b5287d7ee 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -49,10 +49,8 @@ $(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
ifeq ($(BUILD_X64),TRUE)
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
-$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
endif
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
diff --git a/scp2/InstallModule_winexplorerext.mk b/scp2/InstallModule_winexplorerext.mk
index 8dbaec80f417..c3da66809a4f 100644
--- a/scp2/InstallModule_winexplorerext.mk
+++ b/scp2/InstallModule_winexplorerext.mk
@@ -16,9 +16,7 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/winexplorerext,\
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/winexplorerext,\
winexplorerextbinarytable \
winexplorerext \
- winexplorerextnt6 \
- $(if $(filter TRUE,$(BUILD_X64)), winexplorerextwin64 \
- winexplorerextwin64nt6) \
+ $(if $(filter TRUE,$(BUILD_X64)),winexplorerextwin64) \
))
$(eval $(call gb_InstallModule_add_scpfiles,scp2/winexplorerext,\
diff --git a/scp2/source/winexplorerext/module_winexplorerext.scp b/scp2/source/winexplorerext/module_winexplorerext.scp
index 440945e89096..d0383b6e036c 100644
--- a/scp2/source/winexplorerext/module_winexplorerext.scp
+++ b/scp2/source/winexplorerext/module_winexplorerext.scp
@@ -20,10 +20,8 @@
#include "AutoInstall/winexplorerextbinarytable"
#include "AutoInstall/winexplorerext"
-#include "AutoInstall/winexplorerextnt6"
#ifdef BUILD_X64
#include "AutoInstall/winexplorerextwin64"
-#include "AutoInstall/winexplorerextwin64nt6"
#endif
Module gid_Module_Optional_Winexplorerext
@@ -34,7 +32,6 @@ Module gid_Module_Optional_Winexplorerext
Dirs = (gid_Dir_Shlxthdl);
Files = (auto_winexplorerextbinarytable_ALL,
auto_winexplorerext_ALL,
- auto_winexplorerextnt6_ALL,
gid_File_Tmp_Userinstall_Winexplorerext_Inf);
End
@@ -48,7 +45,6 @@ Module gid_Module_Optional_Winexplorerext_x64
Styles = (HIDDEN_ROOT);
Dirs = (gid_Dir_Shlxthdl);
Files = (auto_winexplorerextwin64_ALL,
- auto_winexplorerextwin64nt6_ALL,
gid_File_Lib_Msvcp100,
gid_File_Lib_Msvcr100,
gid_File_Lib_Msvcp110,
commit 78d03c63890700be56144cfbafda42749cfd58d2
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 15:49:38 2017 +0200
solenv: installer: remove DONT_DELETE style
This style was only handled in the installer code for registry items,
but in scp2 it was only set for files, so effectively it was unused.
Change-Id: I197eeded29648aee2489e302f7b5e48bf13a545c
diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index c09b696c766c..2cd0cc21062c 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -256,7 +256,6 @@ BEGIN
%allcabinetassigns = ();
%cabfilecounter = ();
%lastsequence = ();
- %dontdeletecomponents = ();
%allcalculated_guids = ();
%calculated_component_guids = ();
%all_english_languagestrings = ();
diff --git a/solenv/bin/modules/installer/windows/component.pm b/solenv/bin/modules/installer/windows/component.pm
index 65d79b84b816..9751caabd4ce 100644
--- a/solenv/bin/modules/installer/windows/component.pm
+++ b/solenv/bin/modules/installer/windows/component.pm
@@ -249,9 +249,6 @@ sub get_registry_component_attributes
# Setting msidbComponentAttributes64bit for 64 bit shell extension in 32 bit installer, too
if ( $componentname =~ m/winexplorerext_x64/ ) { $attributes |= 256; }
- # Setting msidbComponentAttributesPermanent
- if ( exists($installer::globals::dontdeletecomponents{$componentname}) ) { $attributes |= 16; }
-
return $attributes;
}
diff --git a/solenv/bin/modules/installer/windows/registry.pm b/solenv/bin/modules/installer/windows/registry.pm
index 81c4f9a3b268..f7136b887023 100644
--- a/solenv/bin/modules/installer/windows/registry.pm
+++ b/solenv/bin/modules/installer/windows/registry.pm
@@ -363,11 +363,8 @@ sub create_registry_table
push(@{$allregistrycomponentsref}, $registry{'Component_'});
}
- # Collecting all components with DONT_DELETE style
my $style = "";
if ( $oneregistry->{'Styles'} ) { $style = $oneregistry->{'Styles'}; }
- if ( $style =~ /\bDONT_DELETE\b/ ) { $installer::globals::dontdeletecomponents{$registry{'Component_'}} = 1; }
-
# Collecting all registry components with ALWAYS_REQUIRED style
if ( ! ( $style =~ /\bALWAYS_REQUIRED\b/ ))
{
commit f8de1df4be6c97f279dd344ef14e2967d848bd32
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 12:34:47 2017 +0200
scp2: move fonts to AutoInstall
Add new PACKAGE_FILELIST_FONT
The DONT_DELETE style has no effect for files.
The FONT_WARN_IF_EXISTS style has no effect.
Change-Id: Id062ada0a680341c01827e457b1166d625afe8cc
diff --git a/Repository.mk b/Repository.mk
index de4cded208c5..3e8fccfcdc36 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -799,10 +799,8 @@ $(eval $(call gb_Helper_register_packages, \
cli_basetypes_copy \
desktop_install \
$(if $(filter DESKTOP,$(BUILD_TYPE)),desktop_scripts_install) \
- extras_fonts \
extras_wordbook \
$(if $(filter MSC,$(COM)),msvc_dlls) \
- more_fonts_conf \
instsetoo_native_setup \
$(if $(ENABLE_OOENV),instsetoo_native_ooenv) \
odk_headers_generated \
@@ -955,6 +953,25 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
$(if $(filter OPENCL,$(BUILD_TYPE)),sc_opencl_runtimetest) \
))
+$(eval $(call gb_Helper_register_packages_for_install,ooo_fonts,\
+ extras_fonts \
+ $(call gb_Helper_optional,MORE_FONTS,\
+ fonts_caladea \
+ fonts_carlito \
+ fonts_dejavu \
+ fonts_emojione_color \
+ fonts_gentium \
+ fonts_liberation \
+ fonts_liberation_narrow \
+ fonts_libertineg \
+ fonts_opensans \
+ fonts_ptserif \
+ fonts_sourcecode \
+ fonts_sourcesans \
+ $(if $(filter-out WNT,$(OS)),more_fonts_conf) \
+ ) \
+))
+
$(eval $(call gb_Helper_register_packages_for_install,ooo_images,\
postprocess_images \
$(call gb_Helper_optional,HELP,helpcontent2_helpimages) \
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index e13d6367f501..bc9731878ee3 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -34,6 +34,7 @@ $(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FIL
$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST,"ISCHECKFORPRODUCTUPDATES=1"))
$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ooo_fonts,,,,PACKAGE_FILELIST_FONT))
$(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 7242f4c088f7..ce564a51c130 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ooo,\
brand \
libreofficekit \
ooo \
+ ooo_fonts \
ooo_images \
ooobinarytable \
pdfimport \
@@ -61,7 +62,6 @@ $(eval $(call gb_InstallModule_add_scpfiles,scp2/ooo,\
scp2/source/ooo/directory_ooo \
scp2/source/ooo/directory_ooo_macosx \
scp2/source/ooo/file_extra_ooo \
- scp2/source/ooo/file_font_ooo \
scp2/source/ooo/file_library_ooo \
scp2/source/ooo/file_ooo \
scp2/source/ooo/file_resource_ooo \
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index d55084c8bcdb..fc17096b7f48 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -120,6 +120,17 @@ File id \
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
End
+#ifdef WNT
+#define PACKAGE_FILELIST_FONT(id,name) \
+File id \
+ Dir = FILELIST_DIR; \
+ Name = name; \
+ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED, FONT); \
+End
+#else
+#define PACKAGE_FILELIST_FONT PACKAGE_FILELIST
+#endif // WNT
+
#define SDK_PACKAGE_FILELIST(id,name) \
File id \
Dir = FILELIST_SDK_DIR; \
@@ -199,26 +210,6 @@ End
Styles = (PACKED); \
End
-#ifdef UNX
-#define STD_FONT_FILELIST(id,name) \
- File id \
- TXT_FILE_BODY; \
- Dir = FILELIST_DIR; \
- Styles = (FILELIST, PACKED, FONT_WARN_IF_EXISTS); \
- Name = name; \
- End
-#endif
-
-#ifdef WNT
-#define STD_FONT_FILELIST(id,name) \
- File id \
- TXT_FILE_BODY; \
- Dir = FILELIST_DIR; \
- Styles = (FILELIST,PACKED,FONT,DONT_DELETE,FONT_WARN_IF_EXISTS); \
- Name = name; \
- End
-#endif
-
#define LIBO_JAR_FILE(id,name) \
File id \
TXT_FILE_BODY; \
diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
deleted file mode 100644
index 6dfe05538c10..000000000000
--- a/scp2/source/ooo/file_font_ooo.scp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-// OpenSymbol
-
-STD_FONT_FILELIST( gid_File_Fnt_Opensymb, "extras_fonts.filelist" )
-
-#ifndef WITHOUT_FONTS
-
-// DejaVu fonts
-STD_FONT_FILELIST(gid_File_Fnt_DejaVu, "fonts_dejavu.filelist")
-
-// Liberation fonts
-STD_FONT_FILELIST(gid_File_Fnt_LibSansNarrow, "fonts_liberation_narrow.filelist")
-STD_FONT_FILELIST(gid_File_Fnt_Liberation, "fonts_liberation.filelist")
-
-// Gentium fonts
-STD_FONT_FILELIST(gid_File_Fnt_Gentium, "fonts_gentium.filelist")
-
-// Linux Libertine G and Linux Biolinum G fonts
-STD_FONT_FILELIST(gid_File_Fnt_LinuxLibertineG, "fonts_libertineg.filelist")
-
-// PT Serif fonts
-STD_FONT_FILELIST(gid_File_Fnt_PtSerif, "fonts_ptserif.filelist")
-
-// Open Sans fonts
-STD_FONT_FILELIST(gid_File_Fnt_OpenSans, "fonts_opensans.filelist")
-
-// Source Sans Pro fonts
-STD_FONT_FILELIST(gid_File_Fnt_SourceSans, "fonts_sourcesans.filelist")
-
-// Source Code Pro fonts
-STD_FONT_FILELIST(gid_File_Fnt_SourceCode, "fonts_sourcecode.filelist")
-
-//Carlito and Caladea fonts
-STD_FONT_FILELIST(gid_File_Fnt_Carlito, "fonts_carlito.filelist")
-STD_FONT_FILELIST(gid_File_Fnt_Caladea, "fonts_caladea.filelist")
-
-// EmojiOne_Color font
-STD_FONT_FILELIST(gid_File_Fnt_EmojiOne_Color, "fonts_emojione_color.filelist")
-
-#endif
-
-// fontconfig updates to allow proper use of local fonts
-
-#ifdef UNX
-#ifndef WITHOUT_FONTS
-File gid_File_FcLocal_Conf
- Dir = FILELIST_DIR;
- USER_FILE_BODY;
- Styles = (FILELIST);
- Name = "more_fonts_conf.filelist";
-End
-#endif
-#endif
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 48644f36c600..cff32e16930d 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -18,6 +18,7 @@
#include "macros.inc"
#include "AutoInstall/ooo"
+#include "AutoInstall/ooo_fonts"
#include "AutoInstall/ooo_images"
#include "AutoInstall/ooobinarytable"
@@ -98,20 +99,7 @@ Module gid_Module_Root_Fonts_OOo_Hidden
Sortkey = "2100";
Default = YES;
Styles = (HIDDEN_ROOT);
- Files = (gid_File_Fnt_Opensymb,
- gid_File_Fnt_Caladea,
- gid_File_Fnt_Carlito,
- gid_File_Fnt_DejaVu,
- gid_File_Fnt_Gentium,
- gid_File_Fnt_LibSansNarrow,
- gid_File_Fnt_Liberation,
- gid_File_Fnt_LinuxLibertineG,
- gid_File_Fnt_PtSerif,
- gid_File_Fnt_OpenSans,
- gid_File_Fnt_SourceSans,
- gid_File_Fnt_SourceCode,
- gid_File_Fnt_EmojiOne_Color,
- gid_File_FcLocal_Conf);
+ Files = (auto_ooo_fonts_ALL);
End
#endif
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index e47b762bba93..117cbd2b5f02 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -91,7 +91,7 @@ for (gid, jarfile) in autojars:
raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
-scp2pkgtemplates = { "PACKAGE_FILELIST", "SDK_PACKAGE_FILELIST" }
+scp2pkgtemplates = { "PACKAGE_FILELIST", "PACKAGE_FILELIST_FONT", "SDK_PACKAGE_FILELIST" }
for (gid, pkgfilelist) in autopkgs:
if not(scp2pkgtemplate in scp2pkgtemplates):
raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")
commit fbed35762a6b14e8fda5179e320a9c30fd426454
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 15:38:28 2017 +0200
scp2: replace PACKAGE_FILELIST_DIR macro with SDK_PACKAGE_FILELIST
Change-Id: I3632c618e385d3f9963637c26d94b8395d5b8cb5
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index a4bd01cdafd0..e13d6367f501 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -43,7 +43,7 @@ $(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_F
$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST))
-$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,SDK_PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
diff --git a/scp2/InstallModule_sdkoo.mk b/scp2/InstallModule_sdkoo.mk
index 7dfbcfaba49b..4c2881f35128 100644
--- a/scp2/InstallModule_sdkoo.mk
+++ b/scp2/InstallModule_sdkoo.mk
@@ -11,10 +11,6 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/sdkoo))
$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/sdkoo,sdk))
-$(eval $(call gb_InstallModule_add_defs,scp2/sdkoo,\
- -DPACKAGE_FILELIST_DIR=FILELIST_SDK_DIR \
-))
-
$(eval $(call gb_InstallModule_add_scpfiles,scp2/sdkoo,\
scp2/source/sdkoo/sdkoo \
))
diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc
index 8825fdc55d79..d55084c8bcdb 100644
--- a/scp2/inc/macros.inc
+++ b/scp2/inc/macros.inc
@@ -115,7 +115,14 @@
#define PACKAGE_FILELIST(id,name) \
File id \
- Dir = PACKAGE_FILELIST_DIR; \
+ Dir = FILELIST_DIR; \
+ Name = name; \
+ Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
+End
+
+#define SDK_PACKAGE_FILELIST(id,name) \
+File id \
+ Dir = FILELIST_SDK_DIR; \
Name = name; \
Styles = (FILELIST, USE_INTERNAL_RIGHTS, PACKED); \
End
@@ -502,10 +509,6 @@ End
#endif
#endif
-#if !defined PACKAGE_FILELIST_DIR
-#define PACKAGE_FILELIST_DIR FILELIST_DIR
-#endif
-
#define UI_FILELIST(name, file) \
File CONCAT2(gid_File_Share_Config_Sofficecfg_uiconfig_, name) \
TXT_FILE_BODY; \
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 4ae3e62ca04c..e47b762bba93 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -91,7 +91,7 @@ for (gid, jarfile) in autojars:
raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
-scp2pkgtemplates = { "PACKAGE_FILELIST" }
+scp2pkgtemplates = { "PACKAGE_FILELIST", "SDK_PACKAGE_FILELIST" }
for (gid, pkgfilelist) in autopkgs:
if not(scp2pkgtemplate in scp2pkgtemplates):
raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")
commit 203c12c7ce5f54971755fb6fb2f04ec36e7797c4
Author: Michael Stahl <mstahl at redhat.com>
Date: Fri Jun 2 15:26:05 2017 +0200
gbuild: AutoInstall: allow per-module Package template
Change-Id: I83404709ae7bd3f4683ea9dab8d3f0e0875bc10f
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 2065de0b7367..a4bd01cdafd0 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -13,39 +13,39 @@ $(eval $(call gb_AutoInstall_add_module,activexbinarytable,LIBO_LIB_FILE_BINARYT
$(eval $(call gb_AutoInstall_add_module,activex,LIBO_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,activexwin64,LIBO_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64"))
$(eval $(call gb_AutoInstall_add_module,base,LIBO_LIB_FILE,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,))
+$(eval $(call gb_AutoInstall_add_module,base_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,calc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,calc_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,draw_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,extensions_ct2n,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_bsh,,,LIBO_JAR_FILE))
-$(eval $(call gb_AutoInstall_add_module,extensions_numbertext,,,,))
+$(eval $(call gb_AutoInstall_add_module,extensions_numbertext,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,extensions_rhino,,,LIBO_JAR_FILE))
-$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE))
+$(eval $(call gb_AutoInstall_add_module,firebirdsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,gnome,LIBO_LIB_FILE,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,graphicfilter,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,impress,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,impress_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,kde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,libreofficekit,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,math,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,"ISCHECKFORPRODUCTUPDATES=1"))
-$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE))
-$(eval $(call gb_AutoInstall_add_module,ooo_images,,,,))
+$(eval $(call gb_AutoInstall_add_module,math_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ogltrans,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,onlineupdate,LIBO_LIB_FILE_COMPONENTCONDITION,LIBO_EXECUTABLE_COMPONENTCONDITION,,PACKAGE_FILELIST,"ISCHECKFORPRODUCTUPDATES=1"))
+$(eval $(call gb_AutoInstall_add_module,ooo,LIBO_LIB_FILE,LIBO_EXECUTABLE,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,ooo_images,,,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,ooobinarytable,LIBO_LIB_FILE_BINARYTABLE))
-$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,))
-$(eval $(call gb_AutoInstall_add_module,python_librelogo,))
-$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,python,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,python_scriptprovider,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,python_librelogo,,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,postgresqlsdbc,LIBO_LIB_FILE,,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,quickstart,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE))
-$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE))
+$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,sdk,,SDK_EXECUTABLE,,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,tde,LIBO_LIB_FILE,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE))
+$(eval $(call gb_AutoInstall_add_module,ure,URE_PRIVATE_LIB,URE_EXECUTABLE,URE_JAR_FILE,PACKAGE_FILELIST))
$(eval $(call gb_AutoInstall_add_module,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))
$(eval $(call gb_AutoInstall_add_module,winexplorerextnt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT >= 600"))
@@ -54,7 +54,7 @@ $(eval $(call gb_AutoInstall_add_module,winexplorerextwin64,SHLXTHDL_LIB_FILE_CO
$(eval $(call gb_AutoInstall_add_module,winexplorerextwin64nt6,SHLXTHDL_LIB_FILE_COMPONENTCONDITION,,,"VersionNT64 >= 600"))
endif
$(eval $(call gb_AutoInstall_add_module,writer,LIBO_LIB_FILE))
-$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE))
-$(eval $(call gb_AutoInstall_add_module,xsltfilter,))
+$(eval $(call gb_AutoInstall_add_module,writer_brand,,LIBO_EXECUTABLE,,PACKAGE_FILELIST))
+$(eval $(call gb_AutoInstall_add_module,xsltfilter,,,,PACKAGE_FILELIST))
# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/AutoInstall.mk b/solenv/gbuild/AutoInstall.mk
index 5bf4d985b5cd..9799fc6ecc44 100644
--- a/solenv/gbuild/AutoInstall.mk
+++ b/solenv/gbuild/AutoInstall.mk
@@ -36,6 +36,7 @@ $(call gb_AutoInstall_get_target,%) : $(GBUILDDIR)/AutoInstall.mk \
$(GBUILDDIR)/gen-autoinstall.py \
'$*' '$(SCP2COMPONENTCONDITION)' \
'$(SCP2LIBTEMPLATE)' '$(SCP2EXETEMPLATE)' '$(SCP2JARTEMPLATE)' \
+ '$(SCP2PKGTEMPLATE)' \
$${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE} \
> $@ \
&& rm -f $${SDKLIBFILE} $${LIBFILE} $${EXEFILE} $${JARFILE} $${PKGFILE}
@@ -53,7 +54,7 @@ $(call gb_Helper_make_userfriendly_targets,all,AutoInstall)
endef
-# gb_AutoInstall_add_module module lib_template exe_template jar_template componentcondition
+# gb_AutoInstall_add_module module lib_template exe_template jar_template package_template componentcondition
define gb_AutoInstall_add_module
$(call gb_AutoInstall_get_target,all) : $(call gb_AutoInstall_get_target,$(1))
$(call gb_AutoInstall_get_clean_target,all) : $(call gb_AutoInstall_get_clean_target,$(1))
@@ -64,7 +65,8 @@ $(call gb_AutoInstall_get_target,$(1)) :| $(dir $(call gb_AutoInstall_get_target
$(call gb_AutoInstall_get_target,$(1)) : SCP2LIBTEMPLATE := $(2)
$(call gb_AutoInstall_get_target,$(1)) : SCP2EXETEMPLATE := $(3)
$(call gb_AutoInstall_get_target,$(1)) : SCP2JARTEMPLATE := $(4)
-$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(5)
+$(call gb_AutoInstall_get_target,$(1)) : SCP2PKGTEMPLATE := $(5)
+$(call gb_AutoInstall_get_target,$(1)) : SCP2COMPONENTCONDITION := $(6)
endef
diff --git a/solenv/gbuild/gen-autoinstall.py b/solenv/gbuild/gen-autoinstall.py
index 53690bf439f5..4ae3e62ca04c 100644
--- a/solenv/gbuild/gen-autoinstall.py
+++ b/solenv/gbuild/gen-autoinstall.py
@@ -18,16 +18,17 @@ scp2componentcondition = sys.argv[2]
scp2libtemplate = sys.argv[3]
scp2exetemplate = sys.argv[4]
scp2jartemplate = sys.argv[5]
+scp2pkgtemplate = sys.argv[6]
# use 'with open(file) as f:' to avoid 'ResourceWarning: unclosed file'
-with open(sys.argv[6]) as f:
- sdklibs = f.readline().split()
with open(sys.argv[7]) as f:
- libs = f.readline().split()
+ sdklibs = f.readline().split()
with open(sys.argv[8]) as f:
- exes = f.readline().split()
+ libs = f.readline().split()
with open(sys.argv[9]) as f:
- jars = f.readline().split()
+ exes = f.readline().split()
with open(sys.argv[10]) as f:
+ jars = f.readline().split()
+with open(sys.argv[11]) as f:
pkgs = f.readline().split()
if len(scp2componentcondition) > 0:
@@ -72,16 +73,28 @@ print(", \\\n".join([" " + gid for gid in allgids]))
for (gid, link, target) in autosdklibs:
print("SDK_LIBRARY_LINK(" + gid + "," + link + "," + target + ")")
+scp2libtemplates = { "URE_PRIVATE_LIB", "LIBO_LIB_FILE", "LIBO_LIB_FILE_BINARYTABLE", "LIBO_LIB_FILE_COMPONENTCONDITION", "SHLXTHDL_LIB_FILE", "SHLXTHDL_LIB_FILE_COMPONENTCONDITION" }
for (gid, libfile) in autolibs:
+ if not(scp2libtemplate in scp2libtemplates):
+ raise Exception("invalid scp2libtemplate \"" + scp2libtemplate + "\"")
print(scp2libtemplate + "(" + gid + "," + libfile + scp2componentcondition + ")")
+scp2exetemplates = { "URE_EXECUTABLE", "LIBO_EXECUTABLE", "LIBO_EXECUTABLE_COMPONENTCONDITION", "SDK_EXECUTABLE" }
for (gid, exefile) in autoexes:
+ if not(scp2exetemplate in scp2exetemplates):
+ raise Exception("invalid scp2exetemplate \"" + scp2exetemplate + "\"")
print(scp2exetemplate + "(" + gid + "," + exefile + scp2componentcondition + ")")
+scp2jartemplates = { "URE_JAR_FILE", "LIBO_JAR_FILE" }
for (gid, jarfile) in autojars:
+ if not(scp2jartemplate in scp2jartemplates):
+ raise Exception("invalid scp2jartemplate \"" + scp2jartemplate + "\"")
print(scp2jartemplate + "(" + gid + "," + jarfile + scp2componentcondition + ")")
+scp2pkgtemplates = { "PACKAGE_FILELIST" }
for (gid, pkgfilelist) in autopkgs:
- print("PACKAGE_FILELIST(" + gid + "," + pkgfilelist + ")")
+ if not(scp2pkgtemplate in scp2pkgtemplates):
+ raise Exception("invalid scp2pkgtemplate \"" + scp2pkgtemplate + "\"")
+ print(scp2pkgtemplate + "(" + gid + "," + pkgfilelist + ")")
# vim:set shiftwidth=4 softtabstop=4 expandtab:
More information about the Libreoffice-commits
mailing list