Le contournement du bug #1231 n'a plus lieu d'être.

Le Makefile étant peu verbeux, ajout de messages pour indiquer ce qu'il est en
train de faire.
This commit is contained in:
Christophe Nanteuil 2020-07-09 22:17:57 +02:00 committed by Julien Palard
parent 6470c8057a
commit c88e6c7a9b
2 changed files with 8 additions and 5 deletions

View File

@ -77,12 +77,12 @@ all: setup
.PHONY: setup
setup: venv
# Setup the main clone
echo "Setup the main clone"
if ! [ -d $(CPYTHON_PATH) ]; then \
git clone --depth 16 --branch $(BRANCH) $(UPSTREAM) $(CPYTHON_PATH); \
fi
# Setup the current worktree
echo "Setup the current worktree"
if ! [ -d $(WORKTREE) ]; then \
rm -fr $(WORKTREES); \
git -C $(CPYTHON_PATH) worktree prune; \
@ -100,12 +100,12 @@ setup: venv
fi; \
git -C $(CPYTHON_PATH) worktree add $(WORKTREE)/ $(CPYTHON_CURRENT_COMMIT); \
$(MAKE) -C $(WORKTREE)/Doc/ VENVDIR=$(WORKTREE)/Doc/venv/ PYTHON=$(PYTHON) venv; \
$(WORKTREE)/Doc/venv/bin/python -m pip install Sphinx==2.2.2 docutils==0.15; \
fi
.PHONY: venv
venv:
echo "Setup venv in $(VENV)"
if [ ! -d $(VENV) ]; then $(PYTHON) -m venv --prompt python-docs-fr $(VENV); fi
$(VENV)/bin/python -m pip install -q -r requirements.txt 2> $(VENV)/pip-install.log
if grep -q 'pip install --upgrade pip' $(VENV)/pip-install.log; then \
@ -131,6 +131,7 @@ todo: venv
.PHONY: wrap
wrap: venv
echo "Verify wrapping"
$(VENV)/bin/powrap --check --quiet *.po **/*.po
SRCS = $(shell git diff --name-only $(BRANCH) | grep '.po$$')
@ -141,7 +142,7 @@ DESTS = $(addprefix $(POSPELL_TMP_DIR)/,$(addsuffix .out,$(SRCS)))
spell: venv $(DESTS)
$(POSPELL_TMP_DIR)/%.po.out: %.po dict
echo "Checking $<..."
echo "Pospell checking $<..."
mkdir -p $(@D)
$(VENV)/bin/pospell -p dict -l fr_FR $< && touch $@
@ -154,6 +155,7 @@ verifs: wrap spell
.PHONY: merge
merge: setup
echo "Merge from $(UPSTREAM)"
git -C $(CPYTHON_PATH) fetch $(UPSTREAM)
rm -fr $(WORKTREES)/$(BRANCH)
git -C $(CPYTHON_PATH) worktree prune
@ -182,5 +184,6 @@ merge: setup
.PHONY: clean
clean:
echo "Cleaning *.mo, $(VENV), and $(POSPELL_TMP_DIR)"
rm -fr $(VENV) $(POSPELL_TMP_DIR)
find -name '*.mo' -delete

View File

@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: Python 3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-05-31 18:29+0200\n"
"PO-Revision-Date: 2019-10-19 22:53+0200\n"
"PO-Revision-Date: 2020-07-09 20:53+0200\n"
"Last-Translator: Jules Lasne <jules.lasne@gmail.com>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
"Language: fr\n"