diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-12 14:25:52 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2023-12-12 20:43:57 +0100 |
| commit | 189d827b996438ae92ec85ba63a6ccc8da2b54b0 (patch) | |
| tree | 61fdb441873cd35f9791dfb410e53ad841b82878 /instsetoo_native | |
| parent | c1efe3f73c02b6759afdbe71ee815b503e82381b (diff) | |
Split --with-update-config=... into many --with-online-update-mar-...=...
...and allow each of them to be left off, for debug purposes, even if that may
render the resulting --enable-online-update-mar feature non-functional.
This change tracked each item that was potentially read from the
--with-update-config ini file, and turned each of them into a new
--with-online-update-mar-... option. The only exception and remaining TODO is
bin/update/upload_build_config.py (called from Makefile.gbuild).
distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf (which might well be dead)
set --with-update-config=~/updater.ini with an ini file of unknown content. So
that no items are silently missing if we ever resurrect that distro-config, I
set all of the new options to =TODO there for now.
Change-Id: I17a13e0d190a868436bac10c1b0a6675d8c704c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160622
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 92fb00b14299..2861155c8d31 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -182,7 +182,7 @@ define instsetoo_native_genversionini AllLanguages=$(if $(gb_WITH_LANG),$(gb_WITH_LANG),en-US) buildid=$(shell cd $(SRCDIR) && git log -1 --format=%H) ExtensionUpdateURL=https://updateexte.libreoffice.org/ExtensionUpdateService/check.Update -UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(shell cd $(SRCDIR) && bin/update/get_update_channel.py $(UPDATE_CONFIG))) +UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),$(ONLINEUPDATE_MAR_CHANNEL)) ReferenceOOoMajorMinor=4.1 UpdateID=$(PRODUCTNAME)_$(LIBO_VERSION_MAJOR)_en-US UpdateURL=$(if $(ENABLE_ONLINE_UPDATE),https://update.libreoffice.org/check.php$(if $(filter-out WNT,$(OS)),?pkgfmt=$(PKGFORMAT))) |