From 6910b1e3511701de5f0541fcaa98babf530f55ce Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 2 Jan 2024 15:19:02 +0100 Subject: [PATCH] Hard-code --with-online-update-mar-channel=LOOnlineUpdater (An upcoming change will add an instset/update-settings.ini file containing that value, but using a GeneratedPackage for a single file instead of a directory seems unsupported, so it will use the hard-coded value and a plain Package instead.) Change-Id: I12ffef4db71ce36be9096df674588b39c660e4de Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161545 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- Makefile.gbuild | 6 +++--- config_host.mk.in | 1 - configure.ac | 9 --------- distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 1 - distro-configs/LibreOfficeWin64.conf | 1 - instsetoo_native/CustomTarget_setup.mk | 2 +- solenv/bin/modules/installer/scriptitems.pm | 2 +- 7 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Makefile.gbuild b/Makefile.gbuild index 77100c07be3e..2dfbce13cba0 100644 --- a/Makefile.gbuild +++ b/Makefile.gbuild @@ -51,8 +51,8 @@ upload-update-info: $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) $(eval UPDATE_DIR := $(WORKDIR)/update-info) $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) - MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(ONLINEUPDATE_MAR_CHANNEL)" - MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(ONLINEUPDATE_MAR_UPLOADURL)" "$(ONLINEUPDATE_MAR_CHANNEL)" + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_build_config.py "$(PRODUCTNAME)" "$(VERSION)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" LOOnlineUpdater + MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_builds.py "$(PRODUCTNAME)" "$(BUILDID)" "$(PLATFORM)" "$(UPDATE_DIR)" "$(ONLINEUPDATE_MAR_UPLOADURL)" LOOnlineUpdater MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/upload_build_config.py "$(UPDATE_DIR)" TODO create-partial-info: @@ -60,7 +60,7 @@ create-partial-info: $(eval VERSION := $(LIBO_VERSION_MAJOR).$(LIBO_VERSION_MINOR).$(LIBO_VERSION_MICRO).$(LIBO_VERSION_PATCH)$(LIBO_VERSION_SUFFIX)$(LIBO_VERSION_SUFFIX_SUFFIX)) $(eval PLATFORM := $(RTL_OS)_$(RTL_ARCH)) $(eval MAR_NAME_PREFIX := $(PRODUCTNAME)_$(VERSION)_$(PLATFORM)_$(BUILDID)) - MBSDIFF=$(WORKDIR)/LinkTarget/Executable/mbsdiff MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_partial_update.py "$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(ONLINEUPDATE_MAR_SERVERURL)" "$(ONLINEUPDATE_MAR_CHANNEL)" "$(ONLINEUPDATE_MAR_CERTIFICATEPATH)" "$(ONLINEUPDATE_MAR_CERTIFICATENAME)" "$(ONLINEUPDATE_MAR_BASEURL)" "$(PLATFORM)" "$(BUILDID)" + MBSDIFF=$(WORKDIR)/LinkTarget/Executable/mbsdiff MAR=$(INSTDIR)/program/mar $(SRCDIR)/bin/update/create_partial_update.py "$(WORKDIR)" "$(MAR_NAME_PREFIX)" "$(ONLINEUPDATE_MAR_SERVERURL)" LOOnlineUpdater "$(ONLINEUPDATE_MAR_CERTIFICATEPATH)" "$(ONLINEUPDATE_MAR_CERTIFICATENAME)" "$(ONLINEUPDATE_MAR_BASEURL)" "$(PLATFORM)" "$(BUILDID)" # also possible to bypass the dependencies/the gbuild processing by just running # LD_LIBRARY_PATH=instdir/program make cmd cmd='ALL_LANGS="$(ALL_LANGS)" workdir/LinkTarget/Executable/pocheck' diff --git a/config_host.mk.in b/config_host.mk.in index e30574ff4945..de08cbcac90e 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -514,7 +514,6 @@ export ONLINEUPDATE_MAR_BASEURL=@ONLINEUPDATE_MAR_BASEURL@ export ONLINEUPDATE_MAR_CERTIFICATEDER=@ONLINEUPDATE_MAR_CERTIFICATEDER@ export ONLINEUPDATE_MAR_CERTIFICATENAME=@ONLINEUPDATE_MAR_CERTIFICATENAME@ export ONLINEUPDATE_MAR_CERTIFICATEPATH=@ONLINEUPDATE_MAR_CERTIFICATEPATH@ -export ONLINEUPDATE_MAR_CHANNEL=@ONLINEUPDATE_MAR_CHANNEL@ export ONLINEUPDATE_MAR_SERVERURL=@ONLINEUPDATE_MAR_SERVERURL@ export ONLINEUPDATE_MAR_UPLOADURL=@ONLINEUPDATE_MAR_UPLOADURL@ export OOO_JUNIT_JAR=@OOO_JUNIT_JAR@ diff --git a/configure.ac b/configure.ac index 737ad29d7364..e7857109be88 100644 --- a/configure.ac +++ b/configure.ac @@ -13693,15 +13693,6 @@ else fi AC_SUBST(ONLINEUPDATE_MAR_CERTIFICATEPATH) -AC_MSG_CHECKING([for mar online update channel]) -ONLINEUPDATE_MAR_CHANNEL=$with_online_update_mar_channel -if test -n "$ONLINEUPDATE_MAR_CHANNEL"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) -fi -AC_SUBST(ONLINEUPDATE_MAR_CHANNEL) - AC_MSG_CHECKING([for mar online update serverurl]) ONLINEUPDATE_MAR_SERVERURL=$with_online_update_mar_serverurl if test -n "$ONLINEUPDATE_MAR_SERVERURL"; then diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index d198cdb1b427..e6b7448ccd43 100644 --- a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf +++ b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf @@ -36,7 +36,6 @@ --with-online-update-mar-certificateder=TODO --with-online-update-mar-certificatename=TODO --with-online-update-mar-certificatepath=TODO ---with-online-update-mar-channel=TODO --with-online-update-mar-serverurl=TODO --with-online-update-mar-uploadurl=TODO --with-jdk-home=/etc/alternatives/java_sdk_17 diff --git a/distro-configs/LibreOfficeWin64.conf b/distro-configs/LibreOfficeWin64.conf index a8efd0430a31..8ace248e80d4 100644 --- a/distro-configs/LibreOfficeWin64.conf +++ b/distro-configs/LibreOfficeWin64.conf @@ -8,7 +8,6 @@ --enable-ext-nlpsolver --enable-online-update --enable-online-update-mar ---with-online-update-mar-channel=LOOnlineUpdater --enable-breakpad --with-help=html --with-myspell-dicts diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 2861155c8d31..48efab143c82 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),$(ONLINEUPDATE_MAR_CHANNEL)) +UpdateChannel=$(if $(ENABLE_ONLINE_UPDATE_MAR),LOOnlineUpdater) 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))) diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index df76cb6704c1..18ccd81d2c87 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -655,7 +655,7 @@ sub replace_setup_variables my $updateid = $productname . "_" . $libo_version_major . "_" . $$languagestringref; $updateid =~ s/ /_/g; - my $updatechannel = $ENV{'ONLINEUPDATE_MAR_CHANNEL'}; + my $updatechannel = 'LOOnlineUpdater'; for ( my $i = 0; $i <= $#{$itemsarrayref}; $i++ ) {