Skip to content

Makefile update #1359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 10, 2020
Merged

Makefile update #1359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand All @@ -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 \
Expand All @@ -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$$')
Expand All @@ -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 $@

Expand All @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion sphinx.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pour forcer une compilation

"Last-Translator: Jules Lasne <jules.lasne@gmail.com>\n"
"Language-Team: FRENCH <traductions@lists.afpy.org>\n"
"Language: fr\n"
Expand Down