diff options
author | psi29a <psi29a@gmail.com> | 2023-08-08 09:23:20 +0000 |
---|---|---|
committer | psi29a <psi29a@gmail.com> | 2023-08-08 09:23:20 +0000 |
commit | 81ab0feb2ec2fda488eec043f6fa3d9b020f1521 (patch) | |
tree | aa9e554c846bde3b00ed9141b8a9261d2bb1217d | |
parent | 3b669c2b02e71e07a1cad6a4558f575608974a4e (diff) | |
parent | 8359d8808aa923df857a3ccce9dd8e872a21e2b3 (diff) |
Merge branch 'rtd' into 'openmw-48'stableopenmw-0.48.0
Set openmwluadocumentor version for luadoc generation in 0.48
See merge request OpenMW/openmw!3321
-rw-r--r-- | docs/requirements.txt | 1 | ||||
-rwxr-xr-x | docs/source/generate_luadoc.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/requirements.txt b/docs/requirements.txt index ac82149f5d..4b5c867089 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ parse_cmake sphinx==1.8.5 docutils==0.17.1 +jinja2==3.0.0 diff --git a/docs/source/generate_luadoc.sh b/docs/source/generate_luadoc.sh index f71e3110cb..f3e5c83b85 100755 --- a/docs/source/generate_luadoc.sh +++ b/docs/source/generate_luadoc.sh @@ -44,6 +44,7 @@ if [ -f /.dockerenv ]; then cd ~ git clone https://gitlab.com/ptmikheev/openmw-luadocumentor.git cd openmw-luadocumentor/luarocks + git checkout 156b1ad3597c739e51f537afe08d8d7ad1e95671 luarocks --local pack openmwluadocumentor-0.1.1-1.rockspec luarocks --local install openmwluadocumentor-0.1.1-1.src.rock fi |