From 5d718bd5f00d46d7feba280b1014231bca15af6e Mon Sep 17 00:00:00 2001 From: Patrick Lehmann Date: Fri, 12 Jan 2024 12:27:45 +0100 Subject: [PATCH] Use updated Sphinx workflow template. --- doc/make.bat | 2 +- run.ps1 | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/doc/make.bat b/doc/make.bat index 36101296..b024c756 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -5,7 +5,7 @@ pushd %~dp0 REM Command file for Sphinx documentation if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=py -3.12 -m sphinx.cmd.build -E -a -j 8 --color -w warning.log + set SPHINXBUILD=py -3.12 -m sphinx build -E -a -j 8 --color -w warning.log ) set SOURCEDIR=. set BUILDDIR=_build diff --git a/run.ps1 b/run.ps1 index 8d173518..6d9a630c 100644 --- a/run.ps1 +++ b/run.ps1 @@ -76,7 +76,7 @@ if ($copyall) if ($clean) { Write-Host -ForegroundColor DarkYellow "[live][DOC] Cleaning documentation build directories ..." rm -Force .\doc\$PackageName\* - .\doc\make.bat clean + rm -Force .\doc\_build\* } if ($build) @@ -109,7 +109,9 @@ $jobs = @() if ($livedoc) { Write-Host -ForegroundColor DarkYellow "[live][DOC] Building documentation using Sphinx ..." - .\doc\make.bat html --verbose + cd doc + py -3.12 -m sphinx build -v -E -a -b html -w _build/html.log . _build/html + cd - Write-Host -ForegroundColor DarkYellow "[live][DOC] Documentation finished" } @@ -119,7 +121,9 @@ elseif ($doc) # Compile documentation $compileDocFunc = { - .\doc\make.bat html --verbose + cd doc + py -3.12 -m sphinx build -v -E -a -b html -w _build/html.log . _build/html + cd - } $docJob = Start-Job -Name "Documentation" -ScriptBlock $compileDocFunc # $jobs += $docJob