From 668282add90a99e936ab5036bcfccab84416c999 Mon Sep 17 00:00:00 2001 From: eviau Date: Fri, 4 Nov 2022 21:35:55 -0400 Subject: [PATCH 1/4] =?UTF-8?q?m=C3=A0j:=20utilisation=20de=20htmlserve=20?= =?UTF-8?q?au=20lieu=20de=20serve=20dans=20le=20Makefile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 77a86bacd..069321cb9 100644 --- a/Makefile +++ b/Makefile @@ -121,9 +121,9 @@ ensure_prerequisites: venv/cpython/.git/HEAD .PHONY: serve serve: ifdef SERVE_PORT - $(MAKE) -C venv/cpython/Doc/ serve SERVE_PORT=$(SERVE_PORT) + $(MAKE) -C venv/cpython/Doc/ htmlview SERVE_PORT=$(SERVE_PORT) else - $(MAKE) -C venv/cpython/Doc/ serve + $(MAKE) -C venv/cpython/Doc/ htmlview endif .PHONY: todo From a434179ca3677e66a1c17cffdc1e6917ac688228 Mon Sep 17 00:00:00 2001 From: eviau Date: Sun, 6 Nov 2022 16:27:50 -0500 Subject: [PATCH 2/4] ajout htmlview en plus de serve --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 069321cb9..343c0e5f3 100644 --- a/Makefile +++ b/Makefile @@ -121,11 +121,15 @@ ensure_prerequisites: venv/cpython/.git/HEAD .PHONY: serve serve: ifdef SERVE_PORT - $(MAKE) -C venv/cpython/Doc/ htmlview SERVE_PORT=$(SERVE_PORT) + $(MAKE) -C venv/cpython/Doc/ serve SERVE_PORT=$(SERVE_PORT) else - $(MAKE) -C venv/cpython/Doc/ htmlview + $(MAKE) -C venv/cpython/Doc/ serve endif +.PHONY: htmlview +htmlview: MODE=htmlview +htmlview: all + .PHONY: todo todo: ensure_prerequisites potodo --exclude venv .venv $(EXCLUDED) From bd75181f9a518f9f8e4502aa87eaa9707ecff9fc Mon Sep 17 00:00:00 2001 From: eviau Date: Sun, 13 Nov 2022 08:32:34 -0500 Subject: [PATCH 3/4] =?UTF-8?q?on=20enl=C3=A8ve=20make=20serve=20puisqu'il?= =?UTF-8?q?=20a=20=C3=A9t=C3=A9=20enlev=C3=A9=20en=20upstream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 343c0e5f3..7e3521e29 100644 --- a/Makefile +++ b/Makefile @@ -98,7 +98,7 @@ all: ensure_prerequisites -D latex_elements.inputenc= \ -D latex_elements.fontenc=' \ $(MODE) - @echo "Build success, open file://$(abspath venv/cpython/)/Doc/build/html/index.html or run 'make serve' to see them." + @echo "Build success, open file://$(abspath venv/cpython/)/Doc/build/html/index.html or run 'make htmlview' to see them." # We clone cpython/ inside venv/ because venv/ is the only directory @@ -117,15 +117,6 @@ ensure_prerequisites: venv/cpython/.git/HEAD exit 1; \ fi - -.PHONY: serve -serve: -ifdef SERVE_PORT - $(MAKE) -C venv/cpython/Doc/ serve SERVE_PORT=$(SERVE_PORT) -else - $(MAKE) -C venv/cpython/Doc/ serve -endif - .PHONY: htmlview htmlview: MODE=htmlview htmlview: all From c84258be43d8a57615e905122b501fcd6edfa084 Mon Sep 17 00:00:00 2001 From: eviau Date: Sun, 13 Nov 2022 08:32:59 -0500 Subject: [PATCH 4/4] =?UTF-8?q?m=C3=A0j=20du=20contributing:=20make=20html?= =?UTF-8?q?view=20au=20lieu=20de=20make=20serve?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CONTRIBUTING.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index f68ba1cb8..45d349a7e 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -315,7 +315,7 @@ documentation local : .. code-block:: bash - make serve + make htmlview La documentation est publiée à l'adresse ``_. @@ -329,7 +329,7 @@ nécessaire. Poedit donne beaucoup d'avertissements, par exemple pour vous informer que « la traduction devrait commencer par une majuscule » car c'est le cas pour la source. Ces avertissements ne sont pas tous fondés. En cas de doute, -*affichez et relisez la page HTML produite* avec ``make serve``. +*affichez et relisez la page HTML produite* avec ``make htmlview``. Quatrième étape : publier sa traduction =======================================