diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2016-12-24 06:07:05 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus@libreoffice.org> | 2016-12-24 08:10:30 +0000 |
| commit | b09035675465b156d773e60d6c6650fa12d17766 (patch) | |
| tree | 3f41c21ccaa889268d08ebae6b251d98b59c61cb | |
| parent | 120a87a36e04b01c99c3544aca57faf66934d9c7 (diff) | |
tdf#90753: AutoInstall shell_senddoc package
Change-Id: I6cc638c460a8baa2cd9d29c3b82418b6ecfb630d
Reviewed-on: https://gerrit.libreoffice.org/32397
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Matúš Kukan <matus@libreoffice.org>
| -rw-r--r-- | Repository.mk | 3 | ||||
| -rw-r--r-- | scp2/source/ooo/file_ooo.scp | 9 | ||||
| -rw-r--r-- | scp2/source/ooo/module_ooo.scp | 3 | ||||
| -rw-r--r-- | shell/Module_shell.mk | 11 |
4 files changed, 5 insertions, 21 deletions
diff --git a/Repository.mk b/Repository.mk index 884a30913558..939b91d2d00c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -796,7 +796,6 @@ $(eval $(call gb_Helper_register_packages, \ readlicense_oo_readmes \ setup_native_misc \ share \ - shell_senddoc \ vcl_fontunxpsprint \ )) @@ -886,6 +885,8 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\ package_dtd \ sd_web \ sfx2_emojiconfig \ + $(call gb_Helper_optional,DESKTOP,\ + $(if $(filter-out WNT,$(OS)),$(if $(ENABLE_MACOSX_SANDBOX),,shell_senddoc))) \ $(call gb_Helper_optional,DESKTOP,$(if $(filter-out MACOSX WNT,$(OS)),svx_gengal)) \ $(if $(USING_X11),vcl_fontunxppds) \ $(if $(filter $(OS),MACOSX),vcl_osxres) \ diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index a3e5a6728c28..6d962d0c0fe4 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -27,15 +27,6 @@ #include "macros.inc" -#if defined UNX && ! defined ENABLE_MACOSX_SANDBOX -File gid_File_Bin_Senddoc - BIN_FILE_BODY; - Dir = FILELIST_DIR; - Name = "shell_senddoc.filelist"; - Styles = (FILELIST, PACKED); -End -#endif - STD_RES_FILE( gid_File_Res_Eps, eps ) #if defined WITH_HELP diff --git a/scp2/source/ooo/module_ooo.scp b/scp2/source/ooo/module_ooo.scp index 210f4e523109..7f1fa993be26 100644 --- a/scp2/source/ooo/module_ooo.scp +++ b/scp2/source/ooo/module_ooo.scp @@ -23,8 +23,7 @@ Module gid_Module_Root PackageInfo = "packinfo_office.txt"; InstallOrder = "20"; MOD_NAME_DESC(MODULE_ROOT_OSL); - Files = (gid_File_Bin_Senddoc, - gid_File_Txt_Pagein_Common, + Files = (gid_File_Txt_Pagein_Common, gid_File_Txt_Pagein_Calc, gid_File_Txt_Pagein_Draw, gid_File_Txt_Pagein_Impress, diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk index 17661e9aa210..53fda24734b6 100644 --- a/shell/Module_shell.mk +++ b/shell/Module_shell.mk @@ -94,14 +94,6 @@ $(eval $(call gb_Module_add_targets,shell,\ Library_syssh \ )) -ifneq ($(OS),WNT) - -$(eval $(call gb_Module_add_targets,shell,\ - StaticLibrary_xmlparser \ -)) - -endif - ifeq ($(USING_X11),TRUE) $(eval $(call gb_Module_add_targets,shell,\ Library_recentfile \ @@ -111,9 +103,10 @@ endif ifneq ($(OS),WNT) $(eval $(call gb_Module_add_targets,shell,\ + StaticLibrary_xmlparser \ Executable_uri_encode \ Library_cmdmail \ - Package_senddoc \ + $(if $(ENABLE_MACOSX_SANDBOX),,Package_senddoc) \ )) endif |