strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move spsupp components to a separate installer feature

Browse source 
Change-Id: Ic95b9f887da83d0931ed54b76d23465660786a79
Reviewed-on: https://gerrit.libreoffice.org/78273
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2019-08-29 16:56:23 +03:00
parent 629dfff3c7
commit 99dd418c94
6 changed files with 54 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Repository.mk
View file

@ -208,7 +208,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
) \ ) \
$(if $(filter WNT,$(OS)), \ $(if $(filter WNT,$(OS)), \
senddoc \ senddoc \
spsupp_helper \
) \ ) \
$(if $(filter OPENCL,$(BUILD_TYPE)),opencltest) \ $(if $(filter OPENCL,$(BUILD_TYPE)),opencltest) \
)) ))
@ -673,17 +672,14 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,activexwin6
)) ))
endif endif
ifneq ($(CXX_X64_BINARY),) $(eval $(call gb_Helper_register_executables_for_install,OOO,spsuppfiles, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ spsupp_helper \
spsupp_x64 \
)) ))
endif
ifneq ($(CXX_X86_BINARY),) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,spsuppfiles, \
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \ $(if $(CXX_X64_BINARY),spsupp_x64) \
spsupp_x86 \ $(if $(CXX_X86_BINARY),spsupp_x86) \
)) ))
endif
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooobinarytable, \
$(if $(WINDOWS_SDK_HOME),\ $(if $(WINDOWS_SDK_HOME),\

1
scp2/AutoInstall.mk
View file

@ -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,quickstart,,LIBO_EXECUTABLE))
$(eval $(call gb_AutoInstall_add_module,reportbuilder,LIBO_LIB_FILE,,LIBO_JAR_FILE,PACKAGE_FILELIST)) $(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,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,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,winexplorerextbinarytable,LIBO_LIB_FILE_BINARYTABLE))
$(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE)) $(eval $(call gb_AutoInstall_add_module,winexplorerext,SHLXTHDL_LIB_FILE))

20
scp2/InstallModule_spsupp.mk Normal file
View file

@ -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:

1
scp2/InstallScript_setup_osl.mk
View file

@ -24,6 +24,7 @@ $(eval $(call gb_InstallScript_use_modules,setup_osl,\
$(if $(filter WNT,$(OS)),\ $(if $(filter WNT,$(OS)),\
scp2/activex \ scp2/activex \
scp2/quickstart \ scp2/quickstart \
scp2/spsupp \
scp2/windows \ scp2/windows \
$(if $(filter MSC,$(COM)),\ $(if $(filter MSC,$(COM)),\
scp2/winexplorerext \ scp2/winexplorerext \

1
scp2/Module_scp2.mk
View file

@ -22,6 +22,7 @@ $(eval $(call gb_Module_add_targets,scp2,\
InstallModule_onlineupdate \ InstallModule_onlineupdate \
InstallModule_ooo \ InstallModule_ooo \
InstallModule_python \ InstallModule_python \
InstallModule_spsupp \
InstallModule_ure \ InstallModule_ure \
InstallModule_writer \ InstallModule_writer \
InstallModule_xsltfilter \ InstallModule_xsltfilter \

26
scp2/source/spsupp/module_spsupp.scp Normal file
View file

@ -0,0 +1,26 @@
/*
* 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/.
*/
#include "macros.inc"
#include "AutoInstall/spsuppfiles"
#ifdef WNT
Module gid_Module_Optional_SharePointSupport
ParentID = gid_Module_Optional;
Name = "gid_Module_Optional_SharePointSupport";
Description = "gid_Module_Optional_SharePointSupport";
Sortkey = "1300";
Default = YES;
Styles = (HIDDEN_ROOT);
Files = (auto_spsuppfiles_ALL);
End
#endif