[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - Repository.mk scp2/source setup_native/Library_reg_dlls.mk setup_native/Module_setup_native.mk setup_native/source solenv/bin

2020-01-11 Thread Mike Kaganski (via logerrit) 
 Repository.mk |1 
 scp2/source/ooo/windowscustomaction_ooo.scp   |   41 +
 scp2/source/spsupp/module_spsupp.scp  |   18 
 setup_native/Library_reg_dlls.mk  |   40 +
 setup_native/Module_setup_native.mk   |1 
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.cxx |  309 ++
 setup_native/source/win32/customactions/reg_dlls/reg_dlls.def |5 
 solenv/bin/modules/installer/windows/feature.pm   |   23 
 8 files changed, 432 insertions(+), 6 deletions(-)

New commits:
commit 8346a44b7dfa23e818ccd75deade9f47e6bd133a
Author: Mike Kaganski 
AuthorDate: Wed May 22 19:17:44 2019 +0300
Commit: Mike Kaganski 
CommitDate: Sat Jan 11 16:19:57 2020 +0100

Register spsupp*.dll during installation

This registers SharePoint integration libraries using regsvr.exe.
Both 32-bit and 64-bit libraries are registered; registration of
LOSPSupport.OpenDocuments is unconditional.

This introduces a new hidden MSI feature, which is disabled for
installation: gm_SharePointSupport_SubstMSO. When installed, it
registers SharePoint.OpenDocuments class in registry, thus
overriding registration of this component by MS Office, allowing
LibreOffice to serve as MS Office replacement working in IE with
SharePoint. To install the feature, either a transform is needed
setting the feature's level <= 100, or a command line:

  msiexec path-to-msi ADDLOCAL=gm_SharePointSupport_SubstMSO

Change-Id: I5517bbb68dcc6db8bcb2bbc2368394ee4a62d741
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86452
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86462
Tested-by: Jenkins CollaboraOffice 

diff --git a/Repository.mk b/Repository.mk
index 6d1458238231..0975164d6636 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -687,6 +687,7 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinaryta
instooofiltmsi \
inst_msu_msi \
qslnkmsi \
+   reg_dlls \
reg4allmsdoc \
sdqsmsi \
sellangmsi \
diff --git a/scp2/source/ooo/windowscustomaction_ooo.scp 
b/scp2/source/ooo/windowscustomaction_ooo.scp
index bc7201b9b2b4..116b437b1ed3 100644
--- a/scp2/source/ooo/windowscustomaction_ooo.scp
+++ b/scp2/source/ooo/windowscustomaction_ooo.scp
@@ -221,3 +221,44 @@ WindowsCustomAction gid_Customaction_RegisterSomeExtensions
 End
 
 #endif /* HAVE_WINDOWS_SDK */
+
+/* Deferred not-impersonated actions that will call regsvr32 to (un)register 
DLLs.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue) + 1024 (msidbCustomActionTypeInScript)
+ * + 2048 (msidbCustomActionTypeNoImpersonate).
+ * Since deferred actions don't have access to current DB, the actions depend 
on
+ * immediate-executed action prep_reg_unreg_dlls (see below) that precedes it, 
and
+ * sets this action's CustomActionData property.
+ */
+
+WindowsCustomAction gid_Customaction_reg_dlls
+Name = "reg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "RegDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "reg_dlls", "InstallFinalize");
+End
+
+WindowsCustomAction gid_Customaction_unreg_dlls
+Name = "unreg_dlls";
+Typ = "3137";
+Source = "reg_dlls.dll";
+Target = "UnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "unreg_dlls", 
"UnpublishComponents");
+End
+
+/* Immediately-executed action that adds registration command lines for 
spsupp_x*.dll
+ * to "[un]reg_dlls" properties.
+ * Custom action type 1 (msidbCustomActionTypeDll + 
msidbCustomActionTypeBinaryData)
+ * + 64 (msidbCustomActionTypeContinue).
+ */
+WindowsCustomAction gid_Customaction_prep_reg_dlls
+Name = "prep_reg_unreg_dlls";
+Typ = "65";
+Source = "reg_dlls.dll";
+Target = "PrepRegUnregDLLs";
+Inbinarytable = 1;
+Assignment1 = ("InstallExecuteSequence", "", "behind_CostFinalize");
+End
diff --git a/scp2/source/spsupp/module_spsupp.scp 
b/scp2/source/spsupp/module_spsupp.scp
index 39c547a5fa5c..b97a84a699d5 100644
--- a/scp2/source/spsupp/module_spsupp.scp
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -22,5 +22,23 @@ Module gid_Module_Optional_SharePointSupport
 Files = (auto_spsuppfiles_ALL);
 End
 
+/*
+ * This is an *empty* feature disabled by default, that controls custom action 
registering
+ * SharePoint.OpenDocuments class, which replaces registration of that class 
from MSO.
+ * It is disabled to allow co-existing with MS Office. To install, a transform 
must be
+ * used that would set its level to non-0 value, or a command line like
+ *
+ * msiexec.exe /i path-to-msi

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - Repository.mk

2019-11-30 Thread Andras Timar (via logerrit) 
 Repository.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 83574bfd3071f557ea67ad831f916fe75291b1e2
Author: Andras Timar 
AuthorDate: Sat Nov 30 18:46:00 2019 +0100
Commit: Andras Timar 
CommitDate: Sat Nov 30 18:46:38 2019 +0100

[cp] Put Karla font to install packages

Change-Id: Ib7defa621096812c3a3199340b2f5977f4de1a07

diff --git a/Repository.mk b/Repository.mk
index c8a4afba4a51..ee8685b09c20 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -990,6 +990,7 @@ $(eval $(call 
gb_Helper_register_packages_for_install,ooo_fonts,\
fonts_emojione_color \
fonts_gentium \
$(if $(MPL_SUBSET),,fonts_kacst) \
+   fonts_karla \
fonts_liberation \
fonts_liberation_narrow \
fonts_libertineg \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - Repository.mk scp2/AutoInstall.mk scp2/InstallModule_spsupp.mk scp2/InstallScript_setup_osl.mk scp2/Module_scp2.mk scp2/source

2019-08-30 Thread Mike Kaganski (via logerrit) 
 Repository.mk|   14 +-
 scp2/AutoInstall.mk  |1 +
 scp2/InstallModule_spsupp.mk |   20 
 scp2/InstallScript_setup_osl.mk  |1 +
 scp2/Module_scp2.mk  |1 +
 scp2/source/spsupp/module_spsupp.scp |   26 ++
 6 files changed, 54 insertions(+), 9 deletions(-)

New commits:
commit 48e7a4eda8fd136f7d9b5a86e0d928e18ad0ad94
Author: Mike Kaganski 
AuthorDate: Thu Aug 29 16:56:23 2019 +0300
Commit: Mike Kaganski 
CommitDate: Sat Aug 31 03:32:41 2019 +0200

Move spsupp components to a separate installer feature

Change-Id: Ic95b9f887da83d0931ed54b76d23465660786a79
Reviewed-on: https://gerrit.libreoffice.org/78273
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 99dd418c94e2b85fca1a13a0c15aa117582da574)
Reviewed-on: https://gerrit.libreoffice.org/78295
Tested-by: Mike Kaganski 

diff --git a/Repository.mk b/Repository.mk
index 949605a8a29e..0de098bd6b1f 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -206,7 +206,6 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,ooo, \
) \
$(if $(filter WNT,$(OS)), \
senddoc \
-   spsupp_helper \
) \
 ))
 
@@ -674,17 +673,14 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin6
 ))
 endif
 
-ifneq ($(CXX_X64_BINARY),)
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
-   spsupp_x64 \
+$(eval $(call gb_Helper_register_executables_for_install,OOO,spsuppfiles, \
+   spsupp_helper \
 ))
-endif
 
-ifneq ($(CXX_X86_BINARY),)
-$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
-   spsupp_x86 \
+$(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,spsuppfiles, \
+   $(if $(CXX_X64_BINARY),spsupp_x64) \
+   $(if $(CXX_X86_BINARY),spsupp_x86) \
 ))
-endif
 
 $(eval $(call 
gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
$(if $(WINDOWS_SDK_HOME),\
diff --git a/scp2/AutoInstall.mk b/scp2/AutoInstall.mk
index 7c9d6c4538bd..9b18c1ecce08 100644
--- a/scp2/AutoInstall.mk
+++ b/scp2/AutoInstall.mk
@@ -45,6 +45,7 @@ $(eval $(call 
gb_AutoInstall_add_module,pdfimport,LIBO_LIB_FILE,LIBO_EXECUTABLE,
 $(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,,SDK_PACKAGE_FILELIST))
+$(eval $(call 
gb_AutoInstall_add_module,spsuppfiles,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))
diff --git a/scp2/InstallModule_spsupp.mk b/scp2/InstallModule_spsupp.mk
new file mode 100644
index ..7d01a7b020ed
--- /dev/null
+++ b/scp2/InstallModule_spsupp.mk
@@ -0,0 +1,20 @@
+# -*- 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_InstallModule_InstallModule,scp2/spsupp))
+
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/spsupp,\
+spsuppfiles \
+))
+
+$(eval $(call gb_InstallModule_add_scpfiles,scp2/spsupp,\
+scp2/source/spsupp/module_spsupp \
+))
+
+# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/scp2/InstallScript_setup_osl.mk b/scp2/InstallScript_setup_osl.mk
index a37a4552c139..f6522cbcdc97 100644
--- a/scp2/InstallScript_setup_osl.mk
+++ b/scp2/InstallScript_setup_osl.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter WNT,$(OS)),\
scp2/activex \
scp2/quickstart \
+   scp2/spsupp \
scp2/windows \
$(if $(filter MSC,$(COM)),\
scp2/winexplorerext \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index c414e09045cb..c65e462a7bb2 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_onlineupdate \
InstallModule_ooo \
InstallModule_python \
+   InstallModule_spsupp \
InstallModule_ure \
InstallModule_writer \
InstallModule_xsltfilter \
diff --git a/scp2/source/spsupp/module_spsupp.scp 
b/scp2/source/spsupp/module_spsupp.scp
new file mode 100644
index ..39c547a5fa5c
--- /dev/null
+++ b/scp2/source/spsupp/module_spsupp.scp
@@ -0,0 +1,26 @@
+/*
+ * This

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - Repository.mk shell/AllLangMoTarget_shell.mk shell/Executable_spsupp_helper.mk shell/inc shell/Module_shell.mk shell/source shell/Win

2019-06-19 Thread Mike Kaganski (via logerrit) 
 Repository.mk  |2 
 shell/AllLangMoTarget_shell.mk |   11 +
 shell/Executable_spsupp_helper.mk  |   37 
 shell/Module_shell.mk  |6 
 shell/WinResTarget_spsupp_dlg.mk   |   14 +
 shell/inc/spsupp/spsuppServ.hpp|2 
 shell/inc/spsupp/spsuppStrings.hrc |   23 ++
 shell/source/win32/spsupp/COMOpenDocuments.cxx |  113 ++--
 shell/source/win32/spsupp/res/spsuppDlg.h  |   27 ++
 shell/source/win32/spsupp/res/spsuppDlg.rc |   29 +++
 shell/source/win32/spsupp/spsuppHelper.cxx |  231 +
 shell/source/win32/spsupp/spsuppServ.cxx   |   17 -
 12 files changed, 453 insertions(+), 59 deletions(-)

New commits:
commit 9d241cb1723a165960ba14183fd8e3c580c71241
Author: Mike Kaganski 
AuthorDate: Tue May 7 21:22:08 2019 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 20 07:09:54 2019 +0200

SharePoint: Add dialog to choose opening in read-only or edit mode.

ViewDocument3 method takes OpenType parameter, which allows to decide
if user can choose opening the document read-only or to edit.

Since we need to show localizable strings, we need to bootstrap part
of LO (l10n), which is impossible when e.g. 64-bit ActiveX DLL tries
to load installed 32-bit sal DLLs. Thus, we need a separate helper
.exe, which architecture matches the rest of installed LO, and which
handles user interaction.

Change-Id: I0ad53ba64272fb84728d2221e3dc85d3eefdda68
Reviewed-on: https://gerrit.libreoffice.org/72355
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit f60cc89ec35f8b1bf56e9f69ef15143fd002c409)
Reviewed-on: https://gerrit.libreoffice.org/74407

diff --git a/Repository.mk b/Repository.mk
index ca1c359b1f64..396bdf585b3a 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -205,6 +205,7 @@ $(eval $(call 
gb_Helper_register_executables_for_install,OOO,ooo, \
) \
$(if $(filter WNT,$(OS)), \
senddoc \
+   spsupp_helper \
) \
 ))
 
@@ -1127,6 +1128,7 @@ $(eval $(call gb_Helper_register_mos,\
scc \
sd \
sfx \
+   shell \
sm \
svl \
svt \
diff --git a/shell/AllLangMoTarget_shell.mk b/shell/AllLangMoTarget_shell.mk
new file mode 100644
index ..41285974e3b7
--- /dev/null
+++ b/shell/AllLangMoTarget_shell.mk
@@ -0,0 +1,11 @@
+# -*- 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_AllLangMoTarget_AllLangMoTarget,shell))
+
+# vim: set noet sw=4 ts=4:
diff --git a/shell/Executable_spsupp_helper.mk 
b/shell/Executable_spsupp_helper.mk
new file mode 100644
index ..5daeff28da56
--- /dev/null
+++ b/shell/Executable_spsupp_helper.mk
@@ -0,0 +1,37 @@
+# -*- 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_Executable_Executable,spsupp_helper))
+
+$(eval $(call gb_Executable_set_targettype_gui,spsupp_helper,YES))
+
+$(eval $(call gb_Executable_set_include,spsupp_helper,\
+-I$(SRCDIR)/shell/inc/spsupp \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_Executable_use_sdk_api,spsupp_helper))
+
+$(eval $(call gb_Executable_use_libraries,spsupp_helper,\
+   i18nlangtag \
+   sal \
+   utl \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,spsupp_helper,\
+shell/source/win32/spsupp/spsuppHelper \
+))
+
+$(eval $(call gb_Executable_add_nativeres,spsupp_helper,spsupp_dlg))
+
+$(eval $(call gb_Executable_use_system_win32_libs,spsupp_helper,\
+shell32 \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index 6d54617f0268..b1bebc69beae 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_Module_add_targets,shell,\
Executable_senddoc \
Library_smplmail \
Library_wininetbe \
+   Executable_spsupp_helper \
 ))
 
 ifeq ($(COM),MSC)
@@ -63,6 +64,7 @@ $(eval $(call gb_Module_add_targets,shell,\
CustomTarget_spsupp_idl \
Library_spsupp \
WinResTarget_spsupp \
+   WinResTarget_spsupp_dlg \
 ))
 
 $(eval $(call gb_Module_add_check_targets,shell,\
@@ -116,4 +118,8 @@ endif
 
 endif
 
+$(eval $(call gb_Module_add_l10n_targets,shell,\
+AllLangMoTarget_shell \
+))
+
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git