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 /onlineupdate/CustomTarget_generated.mk | |
| 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 'onlineupdate/CustomTarget_generated.mk')
| -rw-r--r-- | onlineupdate/CustomTarget_generated.mk | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/onlineupdate/CustomTarget_generated.mk b/onlineupdate/CustomTarget_generated.mk index 266b2db98a97..0673bfbcb832 100644 --- a/onlineupdate/CustomTarget_generated.mk +++ b/onlineupdate/CustomTarget_generated.mk @@ -11,19 +11,29 @@ $(eval $(call gb_CustomTarget_CustomTarget,onlineupdate/generated)) onlineupdate_INC := $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/onlineupdate +# For debug purposes, ONLINEUPDATE_MAR_CERTIFICATEDER can be empty, but gen_cert_header.py always +# expects an existing certificate-der=... pathname, so as a hack fall back to the generated +# update.ini itself as the pathanme of the certfiicate DER file (though that will cause +# gen_cert_header.py to generate nonsense data, of course): +$(call gb_CustomTarget_get_workdir,onlineupdate/generated)/update.ini: | \ + $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/.dir + printf '[Updater]\ncertificate-der=%s\n' '$(or $(ONLINEUPDATE_MAR_CERTIFICATEDER),$@)' > $@ + $(onlineupdate_INC)/primaryCert.h : \ $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py \ - $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_ExternalExecutable_get_dependencies,python) \ + $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/update.ini $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1) mkdir -p $(dir $@) - $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py "primaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/primaryCert.h #"$(UPDATE_CONFIG)" + $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py "primaryCertData" $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/update.ini > $(onlineupdate_INC)/primaryCert.h $(onlineupdate_INC)/secondaryCert.h : \ $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py \ - $(call gb_ExternalExecutable_get_dependencies,python) + $(call gb_ExternalExecutable_get_dependencies,python) \ + $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/update.ini $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,,1) mkdir -p $(dir $@) - $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py "secondaryCertData" $(UPDATE_CONFIG) > $(onlineupdate_INC)/secondaryCert.h #"$(UPDATE_CONFIG)" + $(call gb_ExternalExecutable_get_command,python) $(SRCDIR)/onlineupdate/source/update/updater/gen_cert_header.py "secondaryCertData" $(call gb_CustomTarget_get_workdir,onlineupdate/generated)/update.ini > $(onlineupdate_INC)/secondaryCert.h $(call gb_CustomTarget_get_target,onlineupdate/generated) : \ $(onlineupdate_INC)/primaryCert.h \ |