diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-11 17:02:43 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2024-01-12 11:55:17 +0100 |
| commit | f7accbfdf3231bfa48f42533e2bcbb27b8a4af04 (patch) | |
| tree | f8b0fff5fc97f770d4c03d24394e5ce2420da0e6 /external | |
| parent | f259a4636308fbdb8c5d8b9f430e3d53018f327b (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>
(cherry picked from commit 44ea2602e3ed8839012582a466775f10da86ee4b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161937
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'external')
| -rw-r--r-- | external/onlineupdate/UnpackedTarball_onlineupdate.mk | 6 | ||||
| -rw-r--r-- | external/onlineupdate/cygpath.patch | 11 | ||||
| -rw-r--r-- | external/onlineupdate/lo.patch | 10 |
3 files changed, 27 insertions, 0 deletions
diff --git a/external/onlineupdate/UnpackedTarball_onlineupdate.mk b/external/onlineupdate/UnpackedTarball_onlineupdate.mk index d27a191d50ee..166ede0a6b9b 100644 --- a/external/onlineupdate/UnpackedTarball_onlineupdate.mk +++ b/external/onlineupdate/UnpackedTarball_onlineupdate.mk @@ -18,6 +18,12 @@ $(eval $(call gb_UnpackedTarball_add_patches,onlineupdate, \ external/onlineupdate/lo.patch \ )) +ifeq ($(OS),WNT) +$(eval $(call gb_UnpackedTarball_add_patches,onlineupdate, \ + external/onlineupdate/cygpath.patch \ +)) +endif + # The update maintenance service that is used on Windows has a couple of checks that files in the # to-be-updated installation set are signed, which would fail for --disable-windows-build-signing; # so, as a HACK for debugging purposes, silence those problematic checks for --enable-dbgutil: diff --git a/external/onlineupdate/cygpath.patch b/external/onlineupdate/cygpath.patch new file mode 100644 index 000000000000..e5ca1d0bcf8c --- /dev/null +++ b/external/onlineupdate/cygpath.patch @@ -0,0 +1,11 @@ +--- 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" + archivefiles="updatev3.manifest" + diff --git a/external/onlineupdate/lo.patch b/external/onlineupdate/lo.patch index 870857b7ba46..6935afef1558 100644 --- a/external/onlineupdate/lo.patch +++ b/external/onlineupdate/lo.patch @@ -289,3 +289,13 @@ mv -f "$workdir/output.mar" "$archive" # cleanup +--- tools/update-packaging/make_incremental_update.sh ++++ tools/update-packaging/make_incremental_update.sh +@@ -135,7 +135,6 @@ + if [ ! -f "precomplete" ]; then + if [ ! -f "Contents/Resources/precomplete" ]; then + notice "precomplete file is missing!" +- exit 1 + fi + fi + |