29/11/2024 00:05, Paul Szczepanek: > To facilitate deploying docs to the website > and make paths more consistent remove the html > directory from docs nested in html directories. > > Signed-off-by: Paul Szczepanek <paul.szczepa...@arm.com> > Reviewed-by: Luca Vizzarro <luca.vizza...@arm.com> > --- > buildtools/call-sphinx-build.py | 6 ++++-- > doc/api/meson.build | 2 +- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py > index 2c7de54285..3e5fc813a2 100755 > --- a/buildtools/call-sphinx-build.py > +++ b/buildtools/call-sphinx-build.py > @@ -30,8 +30,10 @@ > > # run sphinx, putting the html output in a "html" directory > with open(join(dst, 'sphinx_html.out'), 'w') as out: > - process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')], > - stdout=out) > + # don't append html dir if dst is already nested in a html dir > + top_2_dirs = os.path.join(*os.path.normpath(dst).split(os.path.sep)[-2:]) > + html_dst = dst if 'html' in top_2_dirs else join(dst, 'html') > + process = run(sphinx_cmd + ['-b', 'html', src, html_dst], stdout=out)
There is still a file in the extra html directory: build/doc/api/html/dts/html/_static/css/custom.css I suppose that we need to change this line: dst_css = join(dst, 'html', '_static', 'css', css) into dst_css = join(html_dst, '_static', 'css', css) Then it should become this path: build/doc/api/html/dts/_static/css/custom.css
