From ad4d3cde8819e41eb54ff0dc2e71fa4e53a2ecc5 Mon Sep 17 00:00:00 2001 From: Christophe Nanteuil Date: Sat, 28 Jan 2023 16:16:22 +0100 Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20du=20Makefile=20:=20-=20ajo?= =?UTF-8?q?ut=20du=20nettoyage=20de=20locales/$(LANGUAGE)/LC=5FMESSAGES/?= =?UTF-8?q?=20dans=20la=20cible=20'clean'=20-=20variable=20suppl=C3=A9ment?= =?UTF-8?q?aire=20pour=20pr=C3=A9ciser=20en=20ligne=20de=20commande=20la?= =?UTF-8?q?=20gestion=20des=20=20=20erreurs=20par=20Sphinx=20-=20s=C3=A9pa?= =?UTF-8?q?ration=20dans=20l'appel=20au=20Makefile=20de=20cpython=20du=20p?= =?UTF-8?q?aram=C3=A8tre=20JOBS=20pour=20qu'il=20=20=20soit=20pris=20en=20?= =?UTF-8?q?compte=20(en=20lien=20avec=20une=20PR=20vers=20cpython)=20-=20s?= =?UTF-8?q?uppression=20de=20la=20variable=20SERVE=5FPORT=20devenue=20inut?= =?UTF-8?q?ile=20depuis=20le=20commit=20=20=20da21f1dbe04e36a21da14bbb38f8?= =?UTF-8?q?43125e07f237?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0e9d42d6..1b1f238b 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,7 @@ PYTHON := $(shell which python3) MODE := html POSPELL_TMP_DIR := .pospell/ JOBS := auto -SERVE_PORT := +SPHINXERRORHANDLING = -W # Detect OS @@ -90,13 +90,14 @@ all: ensure_prerequisites mkdir -p locales/$(LANGUAGE)/LC_MESSAGES/ $(CP_CMD) -u --parents *.po */*.po locales/$(LANGUAGE)/LC_MESSAGES/ $(MAKE) -C venv/cpython/Doc/ \ - SPHINXOPTS='-j$(JOBS) \ - -D locale_dirs=$(abspath locales) \ + JOBS='$(JOBS)' \ + SPHINXOPTS='-D locale_dirs=$(abspath locales) \ -D language=$(LANGUAGE) \ -D gettext_compact=0 \ -D latex_engine=xelatex \ -D latex_elements.inputenc= \ -D latex_elements.fontenc=' \ + SPHINXERRORHANDLING=$(SPHINXERRORHANDLING) \ $(MODE) @echo "Build success, open file://$(abspath venv/cpython/)/Doc/build/html/index.html or run 'make htmlview' to see them." @@ -162,7 +163,7 @@ verifs: spell line-length sphinx-lint .PHONY: clean clean: @echo "Cleaning *.mo and $(POSPELL_TMP_DIR)" - rm -fr $(POSPELL_TMP_DIR) + rm -fr $(POSPELL_TMP_DIR) locales/$(LANGUAGE)/LC_MESSAGES/ find -name '*.mo' -delete @echo "Cleaning build directory" $(MAKE) -C venv/cpython/Doc/ clean