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
28bad382fa "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>
157298bb80 "android and bin/update: make pythonic"
had removed it, so that `make create-partial-info` would now fail at least with
> Traceback (most recent call last):
> File "bin/update/create_partial_update.py", line 10, in <module>
> from path import UpdaterPath, mkdir_p, convert_to_unix, convert_to_native
> ImportError: cannot import name 'mkdir_p' from 'path' (bin/update/path.py)
(and no idea if that make target would still do anything useful, beyond this
initial hurdle)
Change-Id: Ib1be3304e2b3468dc187c1b5e24041e68a3677fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160397
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
This is a huge mess. Any windows executable does not understand
cygwin paths but for example the bash script only understands unix paths.
Additionally, os.path is unixpath so it is not able to correctly handle
windows paths. We therefore convert everything that we need to handle
to unix paths and only the few paths that are passed in the end to windows
executables back to the native format. We selected mixed mode
(windows path with forward slash) to allow the unix scripts to manipulate
paths.
Change-Id: Ic443415ff5e8277bf0bb8704bbafd35f50767288
Reviewed-on: https://gerrit.libreoffice.org/40755
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Stephan Bergmann