[MERGE] Forward-port of branch 12.0 to 13.0
This commit is contained in:
commit
1f9cd600cc
4
Makefile
4
Makefile
@ -2,7 +2,7 @@
|
||||
|
||||
# Pass WORKERS=auto for parallel build
|
||||
ifndef WORKERS
|
||||
WORKERS = 1
|
||||
WORKERS = auto
|
||||
endif
|
||||
|
||||
SPHINX_BUILD = sphinx-build
|
||||
@ -67,7 +67,7 @@ extensions/odoo_theme/static/style.css: extensions/odoo_theme/static/style.scss
|
||||
|
||||
#=== Development and debugging rules ===#
|
||||
|
||||
fast: SPHINXOPTS += -A collapse_menu=True -j auto
|
||||
fast: SPHINXOPTS += -A collapse_menu=True
|
||||
fast: html
|
||||
|
||||
static: extensions/odoo_theme/static/style.css
|
||||
|
@ -21,6 +21,6 @@ def setup(app):
|
||||
directives.register_directive('autoattribute', PlaceHolder)
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
@ -66,6 +66,6 @@ def setup(app):
|
||||
directives.register_directive('vimeo', Vimeo)
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
@ -21,7 +21,7 @@ def setup(app):
|
||||
))
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
||||
|
@ -75,7 +75,7 @@ def setup(app):
|
||||
app.config.linkcode_resolve = linkcode_resolve
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,7 @@ def setup(app):
|
||||
addnode(app, node, name)
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
||||
@ -183,3 +183,11 @@ class HtmlDomain(Domain):
|
||||
'var': makerole(var),
|
||||
'samp': makerole(samp),
|
||||
}
|
||||
|
||||
def merge_domaindata(self, docnames, otherdata) -> None:
|
||||
"""Merge in data regarding *docnames* from a different domaindata
|
||||
inventory (coming from a subprocess in parallel builds).
|
||||
"""
|
||||
# This extension doesn't store any data on the env
|
||||
# and therefore doesn't need to support this method.
|
||||
pass
|
||||
|
@ -16,7 +16,7 @@ def setup(app):
|
||||
app.add_js_file('js/page_toc.js')
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
||||
|
@ -64,6 +64,6 @@ def setup(app):
|
||||
app.connect('builder-inited', generate_redirects)
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
@ -13,7 +13,7 @@ def setup(app):
|
||||
app.connect('env-updated', add_statics)
|
||||
|
||||
return {
|
||||
'parallel_read_safe': False,
|
||||
'parallel_read_safe': True,
|
||||
'parallel_write_safe': True
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user