diff options
| author | Jan-Marek Glogowski <jan-marek.glogowski@extern.cib.de> | 2019-09-11 14:35:19 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-09-17 00:35:04 +0200 |
| commit | dd928e41f7b34f6fa0c01a94d20f4f33535f9797 (patch) | |
| tree | 97cf2c4ec66c3edb6fec1f16bfdeaf56a9f714ff /desktop/Executable_soffice.mk | |
| parent | 1e4f39b3053314da8df368fa677526bda02eeba4 (diff) | |
WIN allow setting a memory limit for soffice.bin
This adds a Win32 section and two keys to the bootstrap.ini, which
can be used to apply a memory limit to the soffice.bin process on
Windows. Per default the limit won't affect any sub-processes,
because the 2nd key adds JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK to
the Jobs' flag list.
To activte the limit, extend the bootstrap.ini like this:
[Win32]
LimitMaximumMemoryInMB=0
ExcludeChildProcessesFromLimit=true
and adapt the values to your needs. Zero disables the limit.
Reviewed-on: https://gerrit.libreoffice.org/78819
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 6df7568e46b7f307ad6ae94730809fe63a6981a6)
Change-Id: Ic474c6d6cdfe5ff3cfadbe6614030442171df1ae
Reviewed-on: https://gerrit.libreoffice.org/78885
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'desktop/Executable_soffice.mk')
| -rw-r--r-- | desktop/Executable_soffice.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk index d1847d7bf76a..5c9a081ff22e 100644 --- a/desktop/Executable_soffice.mk +++ b/desktop/Executable_soffice.mk @@ -11,6 +11,10 @@ $(eval $(call gb_Executable_Executable,soffice)) $(eval $(call gb_Executable_set_targettype_gui,soffice,YES)) +$(eval $(call gb_Executable_use_externals,soffice,\ + boost_headers \ +)) + $(eval $(call gb_Executable_use_system_win32_libs,soffice,\ advapi32 \ shell32 \ |