configure.ac | 42 +++++++++++++------- distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 2 2 files changed, 30 insertions(+), 14 deletions(-)
New commits: commit b17d051ad56ab706d15a3b696266be1ac1df2e5d Author: Stephan Bergmann <[email protected]> AuthorDate: Thu Dec 7 11:18:12 2023 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Thu Dec 7 13:42:15 2023 +0100 Make --enable-online-update and --enable-online-update=mar orthogonal ...by turning the latter into its own option --enable-online-update-mar. (The intention is to potentially have the experimental --enable-online-update-mar configured in alongside any traditional --enable-online-update, and have it disabled by default at runtime---for which some configuration is needed and which is forthcoming.) Change-Id: Id53b4f52b310da472b305c8b23c1e2ba1931296d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160424 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/configure.ac b/configure.ac index 1f3398fd5a0b..c800a6afd611 100644 --- a/configure.ac +++ b/configure.ac @@ -1872,9 +1872,14 @@ AC_ARG_ENABLE(z7-debug, libo_FUZZ_ARG_ENABLE(online-update, AS_HELP_STRING([--enable-online-update], [Enable the online update service that will check for new versions of - LibreOffice. Disabled by default. Requires --with-privacy-policy-url to be set. - If the value is "mar", the experimental Mozilla-like update will be - enabled instead of the traditional update mechanism.]), + LibreOffice. Disabled by default. Requires --with-privacy-policy-url to be set.]), +,) + +libo_FUZZ_ARG_ENABLE(online-update-mar, + AS_HELP_STRING([--enable-online-update-mar], + [Enable the experimental Mozilla-like online update service that will + check for new versions of LibreOffice. Disabled by default. Requires + --with-update-config to be set.]), ,) AC_ARG_WITH(update-config, @@ -2196,7 +2201,7 @@ AC_ARG_WITH(system-libs, AC_ARG_WITH(system-bzip2, AS_HELP_STRING([--with-system-bzip2], - [Use bzip2 already on system. Used when --enable-online-update=mar + [Use bzip2 already on system. Used when --enable-online-update-mar or --enable-python=internal]),, [with_system_bzip2="$with_system_libs"]) @@ -13586,19 +13591,11 @@ dnl Test whether to enable online update service dnl =================================================================== AC_MSG_CHECKING([whether to enable online update]) ENABLE_ONLINE_UPDATE= -ENABLE_ONLINE_UPDATE_MAR= -UPDATE_CONFIG= if test "$enable_online_update" = ""; then AC_MSG_RESULT([no]) else if test "$enable_online_update" = "mar"; then - AC_MSG_RESULT([yes - MAR-based online update]) - ENABLE_ONLINE_UPDATE_MAR="TRUE" - if test "$with_update_config" = ""; then - AC_MSG_ERROR([mar based online updater needs an update config specified with "with-update-config]) - fi - UPDATE_CONFIG="$with_update_config" - AC_DEFINE(HAVE_FEATURE_UPDATE_MAR) + AC_MSG_ERROR([--enable-online-update=mar is deprecated, use --enable-online-update-mar instead]) elif test "$enable_online_update" = "yes"; then if test "$enable_curl" != "yes"; then AC_MSG_ERROR([--disable-online-update must be used when --disable-curl is used]) @@ -13610,6 +13607,25 @@ else fi fi AC_SUBST(ENABLE_ONLINE_UPDATE) + + +dnl =================================================================== +dnl Test whether to enable mar online update service +dnl =================================================================== +AC_MSG_CHECKING([whether to enable mar online update]) +ENABLE_ONLINE_UPDATE_MAR= +UPDATE_CONFIG= +if test "$enable_online_update_mar" = yes; then + AC_MSG_RESULT([yes]) + ENABLE_ONLINE_UPDATE_MAR="TRUE" + if test "$with_update_config" = ""; then + AC_MSG_ERROR([mar based online updater needs an update config specified with "with-update-config]) + fi + UPDATE_CONFIG="$with_update_config" + AC_DEFINE(HAVE_FEATURE_UPDATE_MAR) +else + AC_MSG_RESULT([no]) +fi AC_SUBST(ENABLE_ONLINE_UPDATE_MAR) AC_SUBST(UPDATE_CONFIG) diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index 29c6303a1448..e2c510f509f8 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -28,7 +28,7 @@ --enable-ext-nlpsolver --enable-epm --enable-python=internal ---enable-online-update=mar +--enable-online-update-mar --disable-dconf --with-lang=de es fr ar zh-CN --with-package-format=archive
