ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

tdf#170932 Allow building win vcl plugin alongside --enable-headless

Browse Source 
commit 430f603c6a
    Author: Tor Lillqvist <tml@collabora.com>
    Date:   Tue Feb 25 19:52:15 2025 +0200

        Make --enable-headless possible also on Windows, for CODA-W

        [...]

        In the --enable-headless case, freetype, fontconfig and cairo are
        built. For now, cairo is built as a Library (DLL), but fontconfig and
        freetype as StaticLibrary. Possibly should change these to DLLs,
        too. (See preceding commits.) Do not build the vclplug_win.

had introduced support for --enable-headless on
Windows.

As described in the commit message, using the
--enable-headless autogen switch would result in vclplug_win
(i.e. the VCL plugin that provides the UI on Windows)
automatically getting disabled unconditionally.

As described in tdf#170932, this e.g. prevents using
headless mode for document conversion while still
allowing to start LO with a UI with the same build.

Separate the two features:
No longer disable vclplug_win automatically anymore when
--enable-headless is used.
Instead, introduce a new separate --disable-win
autogen switch to explicitly disable the win vcl plugin
(similar to other existing autogen params like
--disable-gtk3 to disable the gtk3 VCL plugin on Linux).

Add that new --disable-win switch to the
CODAWindows distro config, to achieve the original
goal of both enabling headless and disabling vclplug_win
for that build configuration.

Change-Id: I54bc34981327244aa1c8b0aa5b6277ffd1fb4531
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/202043
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@iki.fi>
This commit is contained in:
Michael Weghorn
2026-03-19 12:45:03 +01:00
parent 97b716e52c
commit 057f491458
7 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RepositoryExternal.mk
+1 -1
View File
@@ -4147,7 +4147,7 @@ $(call gb_Executable_add_runtime_dependencies,gengal,\
$(call gb_Library_get_target_for_build,$(CPPU_ENV_FOR_BUILD)_uno) \
$(call gb_Library_get_target_for_build,localedata_en) \
$(if $(filter MACOSX,$(OS_FOR_BUILD)),$(call gb_Library_get_target_for_build,vclplug_osx)) \
$(if $(filter WNT-,$(OS_FOR_BUILD)-$(USE_HEADLESS_CODE)),$(call gb_Library_get_target_for_build,vclplug_win)) \
$(if $(ENABLE_WIN),$(call gb_Library_get_target_for_build,vclplug_win)) \
$(if $(filter host,$(gb_Side)),$(call gb_Package_get_target,postprocess_images)) \
$(call gb_Package_get_target_for_build,postprocess_registry) \
$(INSTROOT_FOR_BUILD)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \