de98291912
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>
58 lines
1.7 KiB
Python
58 lines
1.7 KiB
Python
# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
import os
|
|
import subprocess
|
|
from sys import platform
|
|
|
|
def convert_to_unix(path):
|
|
if platform == "cygwin":
|
|
return subprocess.check_output(["cygpath", "-u", path]).decode("utf-8", "strict").rstrip()
|
|
else:
|
|
return path
|
|
|
|
|
|
def convert_to_native(path):
|
|
if platform == "cygwin":
|
|
return subprocess.check_output(["cygpath", "-m", path]).decode("utf-8", "strict").rstrip()
|
|
else:
|
|
return path
|
|
|
|
|
|
class UpdaterPath(object):
|
|
|
|
def __init__(self, workdir):
|
|
self._workdir = convert_to_unix(workdir)
|
|
|
|
def get_workdir(self):
|
|
return self._workdir
|
|
|
|
def get_update_dir(self):
|
|
return os.path.join(self._workdir, "update-info")
|
|
|
|
def get_current_build_dir(self):
|
|
return os.path.join(self._workdir, "mar", "current-build")
|
|
|
|
def get_mar_dir(self):
|
|
return os.path.join(self._workdir, "mar")
|
|
|
|
def get_previous_build_dir(self):
|
|
return os.path.join(self._workdir, "mar", "previous-build")
|
|
|
|
def get_language_dir(self):
|
|
return os.path.join(self.get_mar_dir(), "language")
|
|
|
|
def ensure_dir_exist(self):
|
|
os.makedirs(self.get_update_dir(), exist_ok=True)
|
|
os.makedirs(self.get_current_build_dir(), exist_ok=True)
|
|
os.makedirs(self.get_mar_dir(), exist_ok=True)
|
|
os.makedirs(self.get_previous_build_dir(), exist_ok=True)
|
|
os.makedirs(self.get_language_dir(), exist_ok=True)
|
|
|
|
# vim: set shiftwidth=4 softtabstop=4 expandtab:
|