Use updated Sphinx workflow template.

pyTooling · Jan 12, 2024 · 5d718bd · 5d718bd
1 parent b8e1096
commit 5d718bd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git 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
@@ -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