diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-11 17:02:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-11 21:01:51 +0100 |
| commit | de98291912f6fddca8ff6cc3212c8e3850977892 (patch) | |
| tree | 999b1dc94e144c64879ffa84ab93e567af7c2853 /distro-configs/Jenkins | |
| parent | f97dc9d815ad8fdd75cbcd9c18b2e585ecf39ca5 (diff) | |
Fix `make create-partial-info` (for Windows, at least)
I got lost trying to figure out how the original
bin/update/create_partial_update.py code was meant to obtain old and new
installation trees to diff, so I simplified that down to the create-partial-info
make target now expecting an ONLINEUPDATE_MAR_OLDARCHIVE make variable that
points at the old archive install set. (And the
--with-online-update-mar-serverurl configure option is gone for good again.)
The remaining changes are similar to what was needed in
28bad382face10be75af3875e44dde89fbc78108 "Fix `make create-update-info` (for
Windows, at least)". (And the mbsdiff and mar tools expect Windows-style
pathnames, but mktemp returns a Unix-style pathname in cygwin shell scripts, so
this needed an additional Windows-only external/onlineupdate/cygpath.patch.)
Change-Id: I40690210d62e3f26fb2d574914a0dd4323e6cd62
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161924
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Diffstat (limited to 'distro-configs/Jenkins')
| -rw-r--r-- | distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf b/distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf index e6b7448ccd43..9ff8d98add4e 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-serverurl=TODO --with-online-update-mar-uploadurl=TODO --with-jdk-home=/etc/alternatives/java_sdk_17 --enable-odk |