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>
This commit is contained in:
Michael Stahl
parent
6f5186a94d
commit
c18d3f8823
11 changed files with 90 additions and 10 deletions
|
|
@ -1072,10 +1072,13 @@ $(eval $(call gb_Helper_register_packages_for_install,python_scriptprovider, \
|
|||
scripting_scriptproviderforpython \
|
||||
))
|
||||
|
||||
ifeq (LIBRELOGO,$(filter LIBRELOGO,$(BUILD_TYPE)))
|
||||
$(eval $(call gb_Helper_register_packages_for_install,python_librelogo, \
|
||||
librelogo \
|
||||
librelogo_properties \
|
||||
))
|
||||
endif # LIBRELOGO
|
||||
|
||||
endif # DISABLE_PYTHON
|
||||
|
||||
# External executables
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|||
jurt \
|
||||
jvmaccess \
|
||||
jvmfwk \
|
||||
librelogo \
|
||||
$(call gb_Helper_optional,LIBRELOGO,librelogo) \
|
||||
libreofficekit \
|
||||
lingucomponent \
|
||||
linguistic \
|
||||
|
|
|
|||
|
|
@ -5,4 +5,6 @@
|
|||
|
||||
#undef PYTHON_VERSION_STRING
|
||||
|
||||
#define ENABLE_LIBRELOGO 0
|
||||
|
||||
#endif // CONFIG_PYTHON_H
|
||||
|
|
|
|||
22
configure.ac
22
configure.ac
|
|
@ -1830,6 +1830,11 @@ AC_ARG_ENABLE(opencl,
|
|||
[Disable OpenCL support.]),
|
||||
,enable_opencl=yes)
|
||||
|
||||
libo_FUZZ_ARG_ENABLE(librelogo,
|
||||
AS_HELP_STRING([--disable-librelogo],
|
||||
[Do not build LibreLogo.]),
|
||||
,enable_librelogo=yes)
|
||||
|
||||
dnl ===================================================================
|
||||
dnl Optional Packages (--with/without-)
|
||||
dnl ===================================================================
|
||||
|
|
@ -9461,6 +9466,23 @@ AC_SUBST(PYTHON_VERSION)
|
|||
AC_SUBST(PYTHON_VERSION_MAJOR)
|
||||
AC_SUBST(PYTHON_VERSION_MINOR)
|
||||
|
||||
AC_MSG_CHECKING([whether to build LibreLogo])
|
||||
case "$enable_python" in
|
||||
no|disable)
|
||||
AC_MSG_RESULT([no; Python disabled])
|
||||
;;
|
||||
*)
|
||||
if test "${enable_librelogo}" = "no"; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
AC_MSG_RESULT([yes])
|
||||
BUILD_TYPE="${BUILD_TYPE} LIBRELOGO"
|
||||
AC_DEFINE([ENABLE_LIBRELOGO],1)
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(ENABLE_LIBRELOGO)
|
||||
|
||||
ENABLE_MARIADBC=
|
||||
MARIADBC_MAJOR=1
|
||||
MARIADBC_MINOR=0
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
#define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
|
||||
|
||||
#include <rtl/ustring.hxx>
|
||||
#include <config_python.h>
|
||||
#include <tuple>
|
||||
|
||||
/*
|
||||
|
|
@ -96,7 +97,9 @@ const std::tuple<const char*, OUString, OUString> TIPOFTHEDAY_STRINGARRAY[] =
|
|||
{ NC_("RID_CUI_TIPOFTHEDAY", "%PRODUCTNAME has great extensions to increase your productivity—check them out."), "https://extensions.libreoffice.org", ""},
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "Want to count words for just one particular paragraph style? Use Edit ▸ Find and Replace, click Paragraph Styles, select the style in Find, and click Find All. Read the result in the status bar."), "", "tipoftheday_w.png"},
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "Generate fully customized PDF documents with the exact format, image compression, comments, access rights, password, etc., via File ▸ Export as PDF."), "", ""},
|
||||
#if ENABLE_LIBRELOGO
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "Writer includes LibreLogo: simple Logo-like programming environment with turtle vector graphics, DTP and graphic design."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/swriter/librelogo/LibreLogo.html", "tipoftheday_w.png"}, //local help missing
|
||||
#endif
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "Construct your own 2D shapes in Draw. Select two or more objects, and explore possibilities with Shape ▸ Combine, Shape ▸ Merge, Shape ▸ Subtract, and Shape ▸ Intersect."), "https://help.libreoffice.org/%PRODUCTVERSION/%LANGUAGENAME/text/sdraw/guide/combine_etc.html", "tipoftheday_d.png"},
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "Do you plan to change your computer and want to recover your customizations? See:"), "https://wiki.documentfoundation.org/UserProfile", ""},
|
||||
{ NC_("RID_CUI_TIPOFTHEDAY", "You can toggle between the field names and the actual value with View ▸ Fields Names (or %MOD1+F9)."), "", "tipoftheday_w.png"},
|
||||
|
|
|
|||
|
|
@ -72,7 +72,9 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
|
|||
org/openoffice/Office/Accelerators-macosx.xcu \
|
||||
org/openoffice/Office/Accelerators-reportbuilder.xcu \
|
||||
org/openoffice/Office/Accelerators-unxwnt.xcu \
|
||||
$(call gb_Helper_optional,LIBRELOGO, \
|
||||
org/openoffice/Office/Addons-librelogo.xcu \
|
||||
) \
|
||||
org/openoffice/Office/Common-writer.xcu \
|
||||
org/openoffice/Office/Common-calc.xcu \
|
||||
org/openoffice/Office/Common-draw.xcu \
|
||||
|
|
@ -111,8 +113,10 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
|
|||
org/openoffice/Office/Embedding-base.xcu \
|
||||
org/openoffice/Office/Embedding-reportbuilder.xcu \
|
||||
org/openoffice/Office/Embedding-writer.xcu \
|
||||
$(call gb_Helper_optional,LIBRELOGO, \
|
||||
org/openoffice/Office/UI/WriterCommands-librelogo.xcu \
|
||||
org/openoffice/Office/UI/WriterWindowState-librelogo.xcu \
|
||||
) \
|
||||
org/openoffice/Office/UI/Controller-reportbuilder.xcu \
|
||||
org/openoffice/TypeDetection/UISort-writer.xcu \
|
||||
org/openoffice/TypeDetection/UISort-calc.xcu \
|
||||
|
|
@ -132,7 +136,9 @@ $(eval $(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/da
|
|||
$(eval $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
|
||||
org/openoffice/Setup.xcu \
|
||||
org/openoffice/Office/Accelerators.xcu \
|
||||
$(call gb_Helper_optional,LIBRELOGO, \
|
||||
org/openoffice/Office/Addons.xcu \
|
||||
) \
|
||||
org/openoffice/Office/Common.xcu \
|
||||
org/openoffice/Office/DataAccess.xcu \
|
||||
org/openoffice/Office/PresentationMinimizer.xcu \
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ postprocess_XCDS := \
|
|||
draw.xcd \
|
||||
graphicfilter.xcd \
|
||||
impress.xcd \
|
||||
librelogo.xcd \
|
||||
lingucomponent.xcd \
|
||||
main.xcd \
|
||||
math.xcd \
|
||||
|
|
@ -110,11 +109,14 @@ postprocess_FILES_impress := \
|
|||
$(postprocess_MOD)/org/openoffice/Office/ProtocolHandler-impress.xcu \
|
||||
$(postprocess_MOD)/org/openoffice/Setup-impress.xcu
|
||||
|
||||
ifeq (LIBRELOGO,$(filter LIBRELOGO,$(BUILD_TYPE)))
|
||||
postprocess_XCDS += librelogo.xcd
|
||||
postprocess_DEPS_librelogo := main writer
|
||||
postprocess_FILES_librelogo := \
|
||||
$(postprocess_MOD)/org/openoffice/Office/Addons-librelogo.xcu \
|
||||
$(postprocess_MOD)/org/openoffice/Office/UI/WriterCommands-librelogo.xcu \
|
||||
$(postprocess_MOD)/org/openoffice/Office/UI/WriterWindowState-librelogo.xcu
|
||||
endif
|
||||
|
||||
postprocess_DEPS_lingucomponent := main
|
||||
postprocess_FILES_lingucomponent := \
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
37
setup_native/source/packinfo/packinfo_librelogo_disabled.txt
Normal file
37
setup_native/source/packinfo/packinfo_librelogo_disabled.txt
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
#
|
||||
# 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/.
|
||||
#
|
||||
# This file incorporates work covered by the following license notice:
|
||||
#
|
||||
# Licensed to the Apache Software Foundation (ASF) under one or more
|
||||
# contributor license agreements. See the NOTICE file distributed
|
||||
# with this work for additional information regarding copyright
|
||||
# ownership. The ASF licenses this file to you under the Apache
|
||||
# License, Version 2.0 (the "License"); you may not use this file
|
||||
# except in compliance with the License. You may obtain a copy of
|
||||
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
||||
#
|
||||
|
||||
# special file to conflict with any old -librelogo that may be installed
|
||||
|
||||
Start
|
||||
module = "gid_Module_Pyuno"
|
||||
solarispackagename = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-pyuno"
|
||||
solarisrequires = "%BASISPACKAGEPREFIX%WITHOUTDOTPRODUCTVERSION-core, SUNWPython"
|
||||
packagename = "%BASISPACKAGEPREFIX%PRODUCTVERSION-pyuno"
|
||||
linuxreplaces = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
|
||||
linuxincompat = "%BASISPACKAGEPREFIX%PRODUCTVERSION-librelogo"
|
||||
freebsdrequires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core"
|
||||
requires = "%BASISPACKAGEPREFIX%PRODUCTVERSION-core %PACKAGEVERSION %PACKAGEVERSION-%PACKAGEREVISION"
|
||||
copyright = "2021 The Document Foundation"
|
||||
solariscopyright = "solariscopyrightfile"
|
||||
vendor = "The Document Foundation"
|
||||
description = "Pyuno module for %PRODUCTNAME %PRODUCTVERSION"
|
||||
destpath = "/opt"
|
||||
packageversion = "%PACKAGEVERSION"
|
||||
End
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ $(eval $(call gb_Module_add_screenshot_targets,sw,\
|
|||
))
|
||||
|
||||
$(eval $(call gb_Module_add_uicheck_targets,sw,\
|
||||
UITest_librelogo \
|
||||
$(call gb_Helper_optional,LIBRELOGO,UITest_librelogo) \
|
||||
UITest_writer_tests \
|
||||
UITest_writer_tests2 \
|
||||
UITest_writer_tests3 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue