From 8ed2c075de5472d31eb1e619cbdcbabb5ee6f64f Mon Sep 17 00:00:00 2001 From: Christophe Nanteuil Date: Wed, 27 Mar 2019 17:23:25 +0100 Subject: [PATCH 1/3] Add checks to Makefile --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Makefile b/Makefile index 3b445a99f..d57226fa5 100644 --- a/Makefile +++ b/Makefile @@ -4,6 +4,9 @@ # # - make # Automatically build an html local version # - make todo # To list remaining tasks +# - make verifs # To check for correctness: wrapping, spelling +# - make powrap # To check for wrapping +# - make pospell # To check for spelling # - make merge # To merge pot from upstream # - make fuzzy # To find fuzzy strings # - make progress # To compute current progression @@ -42,6 +45,7 @@ $(SPHINX_CONF): .PHONY: upgrade_venv upgrade_venv: $(MAKE) -C $(CPYTHON_CLONE)/Doc/ VENVDIR=$(VENV) PYTHON=$(PYTHON) venv + $(VENV)/bin/pip install -U potodo powrap pospell $(VENV)/bin/activate: $(SPHINX_CONF) @@ -58,10 +62,27 @@ progress: $(VENV)/bin/potodo: $(VENV)/bin/activate $(VENV)/bin/pip install potodo +$(VENV)/bin/powrap: $(VENV)/bin/activate + $(VENV)/bin/pip install powrap + +$(VENV)/bin/pospell: $(VENV)/bin/activate + $(VENV)/bin/pip install pospell + .PHONY: todo todo: $(VENV)/bin/potodo $(VENV)/bin/potodo --github python/python-docs-fr +.PHONY: verifs +verifs: powrap pospell + +.PHONY: powrap +powrap: $(VENV)/bin/powrap + $(VENV)/bin/powrap --check --quiet **/*.po + +.PHONY: pospell +pospell: $(VENV)/bin/pospell + $(VENV)/bin/pospell -p dict -l fr_FR **/*.po + .PHONY: merge merge: upgrade_venv ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)" From 452cbf85f7cc1e80768c4427dbaefaf84f2098b0 Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Fri, 29 Mar 2019 22:18:34 +0100 Subject: [PATCH 2/3] Update Makefile Co-Authored-By: christopheNan <35002064+christopheNan@users.noreply.github.com> --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d57226fa5..d0839f7e3 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ verifs: powrap pospell .PHONY: powrap powrap: $(VENV)/bin/powrap - $(VENV)/bin/powrap --check --quiet **/*.po + $(VENV)/bin/powrap --check --quiet *.po */*.po .PHONY: pospell pospell: $(VENV)/bin/pospell From 7430be45b1763892b74f8b111cdff3ea1e724e6d Mon Sep 17 00:00:00 2001 From: Christophe Nanteuil Date: Fri, 29 Mar 2019 22:20:14 +0100 Subject: [PATCH 3/3] Apply correction from code review. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d0839f7e3..0ab2b1b16 100644 --- a/Makefile +++ b/Makefile @@ -81,7 +81,7 @@ powrap: $(VENV)/bin/powrap .PHONY: pospell pospell: $(VENV)/bin/pospell - $(VENV)/bin/pospell -p dict -l fr_FR **/*.po + $(VENV)/bin/pospell -p dict -l fr_FR *.po */*.po .PHONY: merge merge: upgrade_venv