diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-18 20:14:54 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-22 11:30:30 +0100 |
| commit | feb24353f59e49ebcb5ad1dae3ef275ea75bb689 (patch) | |
| tree | f085bdbe37b3320e99c693935663a1c9b9c1e2e3 /scp2 | |
| parent | 31d6684c9a0e366f82b7cc92e43576f4495aaef6 (diff) | |
add --disable-librelogo to disable LibreLogo at build time
Annoyingly the packinfo_*.txt don't support conditionals but we can
work-around that with a little duplication.
Change-Id: Id00a6831effcc63a917fc21d2cd201474fdb559d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109569
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit c18d3f8823a00edcd3dacec4f2052302ab6a70ee)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109764
Tested-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/InstallModule_python.mk | 7 | ||||
| -rw-r--r-- | scp2/source/python/module_python.scp | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/scp2/InstallModule_python.mk b/scp2/InstallModule_python.mk index e38d58a9b821..e4f3bd5f7db4 100644 --- a/scp2/InstallModule_python.mk +++ b/scp2/InstallModule_python.mk @@ -12,7 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/python)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/python,\ python \ python_scriptprovider \ - python_librelogo \ + $(call gb_Helper_optional,LIBRELOGO,python_librelogo) \ )) ifeq ($(DISABLE_PYTHON),TRUE) @@ -32,17 +32,18 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/python,\ $(eval $(call gb_InstallModule_add_defs,scp2/python,\ -DPYVERSION=$(PYTHON_VERSION) \ + $(call gb_Helper_optional,LIBRELOGO,-DENABLE_LIBRELOGO=1) \ )) endif $(eval $(call gb_InstallModule_add_scpfiles,scp2/python,\ scp2/source/python/file_python \ - scp2/source/python/file_python_librelogo \ + $(call gb_Helper_optional,LIBRELOGO,scp2/source/python/file_python_librelogo) \ scp2/source/python/module_python \ )) $(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/python,\ - scp2/source/python/module_python_librelogo \ + $(call gb_Helper_optional,LIBRELOGO,scp2/source/python/module_python_librelogo) \ )) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/scp2/source/python/module_python.scp b/scp2/source/python/module_python.scp index 1424409c1f9c..343ad94029fb 100644 --- a/scp2/source/python/module_python.scp +++ b/scp2/source/python/module_python.scp @@ -24,7 +24,11 @@ #include "AutoInstall/python_scriptprovider" Module gid_Module_Pyuno +#ifdef ENABLE_LIBRELOGO PackageInfo = "packinfo_office.txt"; +#else + PackageInfo = "packinfo_librelogo_disabled.txt"; +#endif ParentID = gid_Module_Root_Brand; Name = "PyUNO"; Description = "Python-UNO bridge"; |