From ba224a20206498677c5c592f169a7faf9a05e7cf Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Sat, 16 Mar 2024 19:25:24 +0900 Subject: [PATCH 1/5] clean: "3.next" removed from CI settings --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c65903f98a..94db97f1eb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: - '3.x' - - '3.next' pull_request: branches: - '*' From e56b571d7e9f96bc156df846c1abb85a224c3154 Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Sat, 16 Mar 2024 19:26:50 +0900 Subject: [PATCH 2/5] build: Set permissions for GitHub actions (Same change as #7387) --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 94db97f1eb..95e3e94def 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,9 @@ on: branches: - '*' +permissions: + contents: read + jobs: build: runs-on: ubuntu-latest From 12bf3a26f7e2362a1b6b65923b1ea0283d8ae33b Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Sat, 16 Mar 2024 19:28:05 +0900 Subject: [PATCH 3/5] build: Bump GitHub Actions (Same changes as #7704) --- .github/workflows/ci.yml | 4 ++-- .github/workflows/deploy_docs_3x.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95e3e94def..e613a4ccf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,9 +19,9 @@ jobs: doc-type: ['HTML', 'EPUB', 'PDF'] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v5 with: python-version: 3.9 diff --git a/.github/workflows/deploy_docs_3x.yml b/.github/workflows/deploy_docs_3x.yml index e8586c7299..9918714405 100644 --- a/.github/workflows/deploy_docs_3x.yml +++ b/.github/workflows/deploy_docs_3x.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Cloning repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: fetch-depth: 0 From 32718fc66980cc64c1576c66b39e460715560b72 Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Sat, 16 Mar 2024 19:35:54 +0900 Subject: [PATCH 4/5] build: Upgrade to Sphinx 7 (Same changes as #7641) --- .github/workflows/ci.yml | 2 +- Dockerfile | 15 +++++++-------- Makefile | 11 ++--------- en/Makefile | 25 ++++++++++++------------- es/Makefile | 25 ++++++++++++------------- fr/Makefile | 25 ++++++++++++------------- ja/Makefile | 25 ++++++++++++------------- pt/Makefile | 25 ++++++++++++------------- requirements.txt | 8 ++++---- ru/Makefile | 25 ++++++++++++------------- tl/Makefile | 25 ++++++++++++------------- tr/Makefile | 25 ++++++++++++------------- zh/Makefile | 25 ++++++++++++------------- 13 files changed, 122 insertions(+), 139 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e613a4ccf2..81814450bb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: - uses: actions/setup-python@v5 with: - python-version: 3.9 + python-version: 3.11 - name: Install dependencies run: | diff --git a/Dockerfile b/Dockerfile index 2e270ea653..a3c82aa89d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,14 @@ -FROM debian:bullseye +FROM debian:bookworm ENV DEBIAN_FRONTEND noninteractive LABEL Description="This image is used to create an environment to contribute to the cakephp/docs" RUN apt-get update && apt-get install -y \ + build-essential \ latexmk \ - openjdk-8-jdk \ php \ - python3-pip \ + python3-full \ texlive-fonts-recommended \ texlive-lang-all \ texlive-latex-extra \ @@ -16,12 +16,11 @@ RUN apt-get update && apt-get install -y \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -COPY requirements.txt /tmp/ -RUN pip3 install -r /tmp/requirements.txt +RUN python3 -m venv /tmp/venv +ENV PATH="/tmp/venv/bin:$PATH" -ADD https://github.com/w3c/epubcheck/releases/download/v4.2.2/epubcheck-4.2.2.zip /epubcheck/epubcheck.zip -RUN unzip /epubcheck/epubcheck.zip -d /epubcheck \ - && mv /epubcheck/epubcheck-4.2.2/* /epubcheck +COPY requirements.txt /tmp/ +RUN pip install -r /tmp/requirements.txt WORKDIR /data VOLUME "/data" diff --git a/Makefile b/Makefile index 1014779c19..ca3165f8eb 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ PDF_LANGS = en es fr pt DEST = website EPUB_ARGS = +SPHINXOPTS = # Get path to theme directory to build static assets. THEME_DIR = $(shell python3 -c 'import os, cakephpsphinx; print(os.path.abspath(os.path.dirname(cakephpsphinx.__file__)))') @@ -32,14 +33,13 @@ epub: $(foreach lang, $(LANGS), epub-$(lang)) latex: $(foreach lang, $(PDF_LANGS), latex-$(lang)) pdf: $(foreach lang, $(PDF_LANGS), pdf-$(lang)) htmlhelp: $(foreach lang, $(LANGS), htmlhelp-$(lang)) -populate-index: $(foreach lang, $(LANGS), populate-index-$(lang)) server: $(foreach lang, $(LANGS), server-$(lang)) rebuild-index: $(foreach lang, $(LANGS), rebuild-index-$(lang)) # Make the HTML version of the documentation with correctly nested language folders. html-%: - cd $* && make html + cd $* && make html SPHINXOPTS="$(SPHINXOPTS)" make build/html/$*/_static/css/dist.css make build/html/$*/_static/js/dist.js @@ -58,13 +58,6 @@ pdf-%: server-%: cd build/html/$* && python3 -m SimpleHTTPServer -populate-index-%: - php scripts/populate_search_index.php --lang="$*" --host="$(ES_HOST_V2)" - -rebuild-index-%: - curl -XDELETE $(ES_HOST)/documentation/3-0-$* - php scripts/populate_search_index.php $* $(ES_HOST) - epub-check-%: build/epub/$* java -jar /epubcheck/epubcheck.jar build/epub/$*/CakePHP.epub $(EPUB_ARGS) diff --git a/en/Makefile b/en/Makefile index 17d949a216..a463687658 100644 --- a/en/Makefile +++ b/en/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = en SPHINX_LANG = en # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/es/Makefile b/es/Makefile index d1954803a6..ad4fde2697 100644 --- a/es/Makefile +++ b/es/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = es SPHINX_LANG = es # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/fr/Makefile b/fr/Makefile index 1827e4417a..ae8709114b 100644 --- a/fr/Makefile +++ b/fr/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = fr SPHINX_LANG = fr # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/ja/Makefile b/ja/Makefile index 9cd4dbb416..601438f2e7 100644 --- a/ja/Makefile +++ b/ja/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = ja SPHINX_LANG = ja # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf-ja + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/pt/Makefile b/pt/Makefile index 9f3182401a..4492ba7d46 100644 --- a/pt/Makefile +++ b/pt/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = pt SPHINX_LANG = pt_BR # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/requirements.txt b/requirements.txt index bb3532e048..5793b68834 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -docutils==0.17.1 -sphinx==4.5.0 -sphinxcontrib-phpdomain==0.8.0 -cakephpsphinx>=0.1.55,<1.0 +docutils==0.20.1 +sphinx==7.0.1 +sphinxcontrib-phpdomain==0.11.1 +cakephpsphinx>=0.1.57,<1.0 diff --git a/ru/Makefile b/ru/Makefile index 8725400457..60ad6dbcb8 100644 --- a/ru/Makefile +++ b/ru/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = ru SPHINX_LANG = ru # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/tl/Makefile b/tl/Makefile index 31e9b5d18a..0aea8d45a7 100644 --- a/tl/Makefile +++ b/tl/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = tl SPHINX_LANG = tl # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,10 +65,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/tr/Makefile b/tr/Makefile index 3f5010ec98..9d14e0561d 100644 --- a/tr/Makefile +++ b/tr/Makefile @@ -8,13 +8,12 @@ PAPER = BUILDDIR = ../build CONFDIR = ../config PYTHON = python3 -LANG = tr SPHINX_LANG = tr # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -41,9 +40,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Oluşturma bitti. HTML dosyaları $(BUILDDIR)/html/$(LANG) konumunda." + @echo "Oluşturma bitti. HTML dosyaları $(BUILDDIR)/html/$(SPHINX_LANG) konumunda." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -66,9 +65,9 @@ json: @echo "Oluşturma bitti; şimdi JSON doyalarını işleyebilirsiniz." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo - @echo "Oluşturma bitti; HTML Help Workshop'u $(BUILDDIR)/htmlhelp/$(LANG) konumundaki" \ + @echo "Oluşturma bitti; HTML Help Workshop'u $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) konumundaki" \ ".hhp proje dosyası ile çalıştırabilisiniz." qthelp: @@ -90,22 +89,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Oluşturma bitti. epub dosyasyı $(BUILDDIR)/epub/$(LANG) konumunda" + @echo "Oluşturma bitti. epub dosyasyı $(BUILDDIR)/epub/$(SPHINX_LANG) konumunda" latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Oluşturma bitti; LaTeX dosyaları $(BUILDDIR)/latex/$(LANG) konumunda." + @echo "Oluşturma bitti; LaTeX dosyaları $(BUILDDIR)/latex/$(SPHINX_LANG) konumunda." @echo "Dizinde (pdf)latex ile kullanmak için \`make' komutunu çalıştırın." \ "İşlemi otomatik olarak yapmak için ( \`make latexpdf' kullanın)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "LaTeX dosyaları pdflatex ile çalıştırılıyor..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex bitti; PDF dosyaları $(BUILDDIR)/latex/$(LANG) konumunda." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex bitti; PDF dosyaları $(BUILDDIR)/latex/$(SPHINX_LANG) konumunda." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text diff --git a/zh/Makefile b/zh/Makefile index 9ef255e2bd..418c1c3147 100644 --- a/zh/Makefile +++ b/zh/Makefile @@ -9,13 +9,12 @@ BUILDDIR = ../build CONFDIR = ../config CONFDIR = ../config PYTHON = python3 -LANG = zh SPHINX_LANG = zh_CN # Internal variables. PAPEROPT_a4 = -D latex_paper_size=a4 PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . +ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees/$(SPHINX_LANG) -c $(CONFDIR) -D language=$(SPHINX_LANG) $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . .PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest @@ -42,9 +41,9 @@ clean: -rm -rf $(BUILDDIR)/* html: - $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(LANG) + $(SPHINXBUILD) -b html -D "exclude_patterns=*-contents.rst" $(ALLSPHINXOPTS) $(BUILDDIR)/html/$(SPHINX_LANG) @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(LANG)." + @echo "Build finished. The HTML pages are in $(BUILDDIR)/html/$(SPHINX_LANG)." dirhtml: $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml @@ -67,10 +66,10 @@ json: @echo "Build finished; now you can process the JSON files." htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(LANG) + $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp/$(SPHINX_LANG) @echo @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp/$(LANG)." + ".hhp project file in $(BUILDDIR)/htmlhelp/$(SPHINX_LANG)." qthelp: $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp @@ -91,22 +90,22 @@ devhelp: @echo "# devhelp" epub: - $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(LANG) + $(SPHINXBUILD) -b epub -D master_doc='epub-contents' $(ALLSPHINXOPTS) $(BUILDDIR)/epub/$(SPHINX_LANG) @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(LANG)." + @echo "Build finished. The epub file is in $(BUILDDIR)/epub/$(SPHINX_LANG)." latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(LANG)." + @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." @echo "Run \`make' in that directory to run these through (pdf)latex" \ "(use \`make latexpdf' here to do that automatically)." latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(LANG) + $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex/$(SPHINX_LANG) @echo "Running LaTeX files through pdflatex..." - make -C $(BUILDDIR)/latex/$(LANG) all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(LANG)." + make -C $(BUILDDIR)/latex/$(SPHINX_LANG) all-pdf + @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex/$(SPHINX_LANG)." text: $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text From f025f2b234736408d792c91b0f1fb4dda0eee2c0 Mon Sep 17 00:00:00 2001 From: Koji Tanaka Date: Sat, 16 Mar 2024 19:36:24 +0900 Subject: [PATCH 5/5] build: Update apt packages first --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81814450bb..213bee1cf2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,6 +32,7 @@ jobs: - name: Install packages run: | + sudo apt update sudo apt install texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended texlive-lang-all - name: Build Docs