office-gobmx/external/onlineupdate/cygpath.patch

--- tools/update-packaging/make_incremental_update.sh
+++ tools/update-packaging/make_incremental_update.sh
@@ -110,7 +110,7 @@
   # Remove the /
   newdir=$(echo "$newdir" | sed -e 's:\/$::')
 fi
-workdir="$(mktemp -d)"
+workdir=$(cygpath -m "$(mktemp -d)")
 updatemanifestv3="$workdir/updatev3.manifest"
 
 mkdir -p "$workdir"
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> 2024-01-11 10:02:43 -06:00			`--- tools/update-packaging/make_incremental_update.sh`
			`+++ tools/update-packaging/make_incremental_update.sh`
			`@@ -110,7 +110,7 @@`
			`# Remove the /`
			`newdir=$(echo "$newdir" \| sed -e 's:\/$::')`
			`fi`
			`-workdir="$(mktemp -d)"`
			`+workdir=$(cygpath -m "$(mktemp -d)")`
			`updatemanifestv3="$workdir/updatev3.manifest"`

Further adapting of create-partial-info ...along the lines of what had already been done for create-update-info, passing files to the mar executable with an -f files.txt instead of on the command line (which could grow too long for Windows), and taking the archive metadata into account. For the latter, `make create-partial-info` now expects a second make variable, ONLINEUPDATE_MAR_OLDMETADATA, in addition to ONLINEUPDATE_MAR_OLDARCHIVE. And there is a new TODO in update/create_partial_update.py that the old and new metadata should be compared for problematic changes. (For now, any such changes would just get lost by an update.) Change-Id: Ide45adedb72958fc32c5b26aa7ebb01530ccf3d7 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161972 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de> 2024-01-12 06:51:57 -06:00			`mkdir -p "$workdir"`