3a445cb497
...and update to latest Mozilla sources.
Originally, this was a non-external onlineupdate module (plus correspsonding
top-level include/onlineupdate/ directory) that apparently contained sources
originally copied from Mozilla and subsequently modified in-place (plus, mixed
in, presumably some sources that were not copied from Mozilla but were our own
inventions). To clean up this mess, this has been turned into a proper
external/onlineupdate module with a tarball containing the pristine external
Mozilla sources.
The sources for the onlineupdate-c003be8b9727672e7d30972983b375f4c200233f.tar.xz
tarball are taken, somewhat arbitrarily, from a recent
<c003be8b97
>
("Bug 1867784 - Force reflow all kids in the last column balancing reflow.
r=layout-reviewers,dholbert") trunk state, by running
`external/onlineupdate/generate-sources.sh ~/github.com/mozilla/gecko-dev` on a
Fedora 39 machine.
The layout of the tarball still mostly follows the old onlineupdate/ layout,
even if that deviates heavily from the actual source layout at
<https://github.com/mozilla/gecko-dev/>. (And some files, which apparently are
not needed, anyway, lacked sources, see the "Missing source for" in
external/onlineupdate/generate-sources.sh. And win_dirent.h/.cpp has meanwhile
been superseded by updateutils_win.h/.cpp.) Merely newly included source files
are laid out in the tarball according to the actual source layout.
Any LO-specific modifications are made via patch files (rather than modifying
the sources inline, as was done in the past): external/onlineupdate/lo.patch
contains whatever modifications are needed to adapt the functionality, while
external/onlineupdate/gtk3deprecated.patch fixes
> workdir/UnpackedTarball/onlineupdate/onlineupdate/source/update/updater/progressui_gtk.cpp:97:21: error: use of undeclared identifier 'gtk_vbox_new'; did you mean 'gtk_box_new'?
> 97 | GtkWidget* vbox = gtk_vbox_new(TRUE, 6);
> | ^~~~~~~~~~~~
> | gtk_box_new
to not use the deprecated gtk_vbox_new, which is hidden because we include
-DGTK_DISABLE_DEPRECATED in our GTK3_CFLAGS as per our configure.ac.
On Windows, the definition of __BYTE_ORDER__ etc. is needed because
workdir/UnpackedTarball/onlineupdate/include/mozilla/ says "Our supported
compilers provide architecture-independent macros for this", but MSVC doesn't
actually, so define here what would implicitly be defined by GCC. Similarly, on
Windows -U_WIN32_WINNT is needed to undo -D_WIN32_WINNT=0x0601 in
solenv/gbuild/platform/windows.mk, which would cause
> workdir\UnpackedTarball\onlineupdate\include\mozilla/WinHeaderOnlyUtils.h(537): error C2065: 'FILE_ID_INFO': undeclared identifier
etc., despite the #include <windws.h> there.
Curiously, the original gb_CustomTarget_CustomTarget,onlineupdate/generated from
onlineupdate/CustomTarget_generated.mk had to be renamed to
gb_CustomTarget_CustomTarget,external/onlineupdate/generated when the file was
moved to external/onlineupdate/CustomTarget_generated.mk, as otherwise a
top-level `make CustomTarget_onlineupdate/generated` would have failed with "No
rule to make target..." Also, as there is no gb_CustomTarget_use_unpacked, its
effect has been poorly mimicked for now in
external/onlineupdate/CustomTarget_generated.mk.
Similarly, as there is no gb_WinResTarget_use_unpacked, its effect has been
poorly mimicked for now in external/onlineupdate/WinResTarget_updater.mk.
The original onlineupdate/workben/test_dialog.cxx, which is actually code
written by us, has been moved to external/onlineupdate/workben/test_dialog.cxx.
The original onlineupdate/qa/ sources (which were apparently not used during the
build) have been preserved for now as external/onlineupdate/qa/, for
documentation purposes.
The original onlineupdate/astyle.options (which was apparently not used during
the build) has been removed.
Change-Id: I5ea606202e7837269e7b128e45af2f0b8c277f9e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160492
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
157 lines
9.6 KiB
Python
157 lines
9.6 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 subprocess
|
|
import unittest
|
|
import json
|
|
import os
|
|
import os.path
|
|
import tempfile
|
|
import shutil
|
|
|
|
|
|
# these contortions seem unavoidable for windows
|
|
def getgbuildtesttools(testcase):
|
|
with open(os.path.join(os.environ['WORKDIR'], 'CustomTarget', 'solenv', 'gbuildtesttools.done'), 'r') as f:
|
|
gbuildtesttools = json.load(f)
|
|
testcase.make = gbuildtesttools['MAKE']
|
|
testcase.bash = gbuildtesttools['BASH']
|
|
testcase.gbuildtojson = gbuildtesttools['GBUILDTOJSON']
|
|
|
|
makeenvvars = ['MAKEOVERRIDES', 'MAKEFLAGS', 'MAKE_TERMERR', 'MAKE_TERMOUT', 'MAKELEVEL', 'MFLAGS', 'GBUILD_TRACE']
|
|
def clearmakevars():
|
|
if 'LD_LIBRARY_PATH' in os.environ:
|
|
os.environ['GBUILDTOJSON_LD_LIBRARY_PATH'] = os.environ['LD_LIBRARY_PATH']
|
|
del(os.environ['LD_LIBRARY_PATH']) # built with ASAN; prevent that
|
|
for makeenvvar in makeenvvars:
|
|
if makeenvvar in os.environ:
|
|
del os.environ[makeenvvar]
|
|
|
|
|
|
class CheckGbuildToJson(unittest.TestCase):
|
|
def setUp(self):
|
|
getgbuildtesttools(self)
|
|
clearmakevars()
|
|
self.tempwork = tempfile.mkdtemp(prefix='gbuild')
|
|
|
|
def tearDown(self):
|
|
shutil.rmtree(self.tempwork)
|
|
|
|
def test_gbuildtojson(self):
|
|
os.makedirs(os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
|
|
shutil.copy(self.gbuildtojson, os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
|
|
(bashscripthandle, bashscriptname) = tempfile.mkstemp('gbuild')
|
|
bashscript = os.fdopen(bashscripthandle, 'w', newline='\n')
|
|
bashscript.write("set -e\n")
|
|
bashscript.write("cd %s/solenv/qa/python/selftest\n" % os.environ['SRCDIR'])
|
|
bashscript.write("%s gbuildtojson WORKDIR=%s\n" % (self.make, self.tempwork.replace('\\', '/')))
|
|
bashscript.close()
|
|
subprocess.check_call([self.bash, bashscriptname.replace('\\', '/')])
|
|
os.remove(bashscriptname)
|
|
jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToJson', 'Library'))
|
|
gbuildlibs = []
|
|
for jsonfilename in jsonfiles:
|
|
with open(os.path.join(self.tempwork, 'GbuildToJson', 'Library', jsonfilename), 'r') as f:
|
|
gbuildlibs.append(json.load(f))
|
|
foundlibs = set()
|
|
for lib in gbuildlibs:
|
|
self.assertEqual(set(lib.keys()), set(['MAKEFILE', 'ASMOBJECTS', 'CFLAGS', 'CFLAGSAPPEND', 'COBJECTS', 'CXXCLRFLAGS', 'CXXCLRFLAGSAPPEND', 'CXXCLROBJECTS', 'CXXFLAGS', 'CXXFLAGSAPPEND', 'CXXOBJECTS', 'DEFS', 'LEXOBJECTS', 'GENCOBJECTS', 'GENCXXOBJECTS', 'GENCXXCLROBJECTS', 'ILIBTARGET', 'INCLUDE', 'JAVAOBJECTS', 'LINKED_LIBS', 'LINKED_STATIC_LIBS', 'LINKTARGET', 'OBJCFLAGS', 'OBJCFLAGSAPPEND', 'OBJCOBJECTS', 'OBJCXXFLAGS', 'OBJCXXFLAGSAPPEND', 'OBJCXXOBJECTS', 'PYTHONOBJECTS', 'YACCOBJECTS']))
|
|
if lib['LINKTARGET'].find('gbuildselftestdep') != -1:
|
|
foundlibs.add('gbuildselftestdep')
|
|
elif lib['LINKTARGET'].find('gbuildselftest') != -1:
|
|
foundlibs.add('gbuildselftest')
|
|
self.assertIn('-Igbuildtojsontestinclude', lib['INCLUDE'].split())
|
|
self.assertIn('gbuildselftestdep', lib['LINKED_LIBS'].split())
|
|
self.assertIn('solenv/qa/python/selftest/selftestobject', lib['CXXOBJECTS'].split())
|
|
self.assertIn('-DGBUILDSELFTESTDEF', lib['DEFS'].split())
|
|
self.assertIn('-DGBUILDSELFTESTCXXFLAG', lib['CXXFLAGSAPPEND'].split())
|
|
self.assertIn('-DGBUILDSELFTESTCFLAG', lib['CFLAGSAPPEND'].split())
|
|
else:
|
|
self.assertTrue(False)
|
|
self.assertEqual(foundlibs, set(['gbuildselftest', 'gbuildselftestdep']))
|
|
self.assertEqual(len(foundlibs), 2)
|
|
jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToJson', 'Executable'))
|
|
gbuildexes = []
|
|
for jsonfilename in jsonfiles:
|
|
with open(os.path.join(self.tempwork, 'GbuildToJson', 'Executable', jsonfilename), 'r') as f:
|
|
gbuildexes.append(json.load(f))
|
|
foundexes = set()
|
|
for exe in gbuildexes:
|
|
if exe['LINKTARGET'].find('gbuildselftestexe') != -1:
|
|
foundexes.add('gbuildselftestexe')
|
|
else:
|
|
self.assertTrue(False)
|
|
self.assertEqual(foundexes, set(['gbuildselftestexe']))
|
|
self.assertEqual(len(foundexes), 1)
|
|
|
|
class CheckGbuildToJsonModules(unittest.TestCase):
|
|
def setUp(self):
|
|
getgbuildtesttools(self)
|
|
clearmakevars()
|
|
self.tempwork = tempfile.mkdtemp(prefix='gbuild')
|
|
self.tempsrc = tempfile.mkdtemp(prefix='gbuild')
|
|
self.srcdir = os.environ['SRCDIR']
|
|
self.builddir = os.environ['BUILDDIR']
|
|
if os.environ['OS'] == 'WNT':
|
|
self.tempworkmixed = self.tempwork.replace('\\','/')
|
|
self.tempsrcmixed = self.tempsrc.replace('\\','/')
|
|
self.srcdirnative = self.srcdir.replace('/','\\')
|
|
self.builddirnative = self.builddir.replace('/','\\')
|
|
else:
|
|
self.tempworkmixed = self.tempwork
|
|
self.tempsrcmixed = self.tempsrc
|
|
self.srcdirnative = self.srcdir
|
|
self.builddirnative = self.builddir
|
|
shutil.copyfile(os.path.join(self.builddirnative, 'config_host.mk'), os.path.join(self.tempsrc, 'config_host.mk'))
|
|
shutil.copyfile(os.path.join(self.builddirnative, 'config_host_lang.mk'), os.path.join(self.tempsrc, 'config_host_lang.mk'))
|
|
shutil.copytree(os.path.join(self.builddirnative, 'config_host'), os.path.join(self.tempsrc, 'config_host'))
|
|
shutil.copyfile(os.path.join(self.srcdirnative, 'Repository.mk'), os.path.join(self.tempsrc, 'Repository.mk'))
|
|
shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryExternal.mk'), os.path.join(self.tempsrc, 'RepositoryExternal.mk'))
|
|
shutil.copyfile(os.path.join(self.srcdirnative, 'RepositoryFixes.mk'), os.path.join(self.tempsrc, 'RepositoryFixes.mk'))
|
|
#print('copytree from _%s_ to _%s_' % (os.path.join(self.srcdirnative, 'solenv').replace('\\', '#').replace('/', '!'), os.path.join(self.tempsrc, 'solenv').replace('\\', '#').replace('/', '!')))
|
|
shutil.copytree(os.path.join(self.srcdirnative, 'solenv'), os.path.join(self.tempsrc, 'solenv'))
|
|
shutil.copytree(os.path.join(self.srcdirnative, 'pch'), os.path.join(self.tempsrc, 'pch'))
|
|
|
|
def tearDown(self):
|
|
shutil.rmtree(self.tempsrc)
|
|
shutil.rmtree(self.tempwork)
|
|
|
|
def test_gbuildtojson(self):
|
|
modules = ['accessibility', 'android', 'animations', 'apple_remote', 'avmedia', 'basctl', 'basegfx', 'basic', 'bean', 'canvas', 'chart2', 'codemaker', 'comphelper', 'cppcanvas', 'cui', 'dbaccess', 'desktop', 'docmodel', 'drawinglayer', 'editeng', 'embeddedobj', 'embedserv', 'eventattacher', 'extras', 'filter', 'forms', 'formula', 'fpicker', 'framework', 'hwpfilter', 'i18nlangtag', 'i18nutil', 'idl', 'instsetoo_native', 'io', 'ios', 'jvmaccess', 'jvmfwk', 'l10ntools', 'librelogo', 'libreofficekit', 'linguistic', 'lotuswordpro', 'nlpsolver', 'o3tl', 'offapi', 'officecfg', 'oovbaapi', 'oox', 'opencl', 'package', 'postprocess', 'pyuno', 'registry', 'remotebridges', 'reportbuilder', 'reportdesign', 'ridljar', 'salhelper', 'sax', 'sc', 'sccomp', 'scp2', 'scripting', 'sd', 'sdext', 'setup_native', 'sfx2', 'slideshow', 'smoketest', 'soltools', 'sot', 'starmath', 'store', 'svgio', 'emfio', 'svl', 'svtools', 'svx', 'sw', 'swext', 'sysui', 'test', 'testtools', 'toolkit', 'ucb', 'ucbhelper', 'udkapi', 'uitest', 'UnoControls', 'unodevtools', 'unoidl', 'unoil', 'unotest', 'unotools', 'unoxml', 'ure', 'uui', 'vbahelper', 'vcl', 'winaccessibility', 'wizards', 'writerperfect', 'xmerge', 'xmlhelp', 'xmloff', 'xmlreader', 'xmlscript', 'xmlsecurity']
|
|
if os.environ['OS'] == 'WNT':
|
|
# for now, use a limited subset for testing on windows as it is so annoyingly slow on this
|
|
modules = ['chart2', 'cui', 'dbaccess', 'framework', 'oox', 'sfx2', 'svl', 'svtools', 'svx', 'toolkit', 'vcl', 'xmloff']
|
|
for module in modules:
|
|
shutil.rmtree(self.tempwork)
|
|
os.makedirs(os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
|
|
shutil.copy(self.gbuildtojson, os.path.join(self.tempwork, 'LinkTarget', 'Executable'))
|
|
if module != 'solenv':
|
|
shutil.copytree(os.path.join(os.environ['SRCDIR'], module), os.path.join(self.tempsrc, module),
|
|
ignore=shutil.ignore_patterns('.#*', '#*', '*~'))
|
|
# ignore Emacs lock (.#*), auto-save (#*), and backup (*~) files
|
|
(bashscripthandle, bashscriptname) = tempfile.mkstemp(prefix='gbuild')
|
|
bashscript = os.fdopen(bashscripthandle, 'w', newline='\n')
|
|
bashscript.write("set -e\n")
|
|
bashscript.write("cd %s/%s\n" % (self.tempsrc.replace('\\','/'), module))
|
|
bashscript.write("%s gbuildtojson WORKDIR=%s SRCDIR=%s\n" % (self.make, self.tempwork.replace('\\', '/'), self.tempsrc.replace('\\','/')))
|
|
bashscript.close()
|
|
subprocess.check_call([self.bash, bashscriptname.replace('\\', '/')])
|
|
os.remove(bashscriptname)
|
|
jsonfiles = os.listdir(os.path.join(self.tempwork, 'GbuildToJson', 'Library'))
|
|
gbuildlibs = []
|
|
for jsonfilename in jsonfiles:
|
|
with open(os.path.join(self.tempwork, 'GbuildToJson', 'Library', jsonfilename), 'r') as f:
|
|
gbuildlibs.append(json.load(f))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|
|
|
|
# vim: set shiftwidth=4 softtabstop=4 expandtab:
|