Skip to content

Commit

Permalink
fix: gettext build
Browse files Browse the repository at this point in the history
  • Loading branch information
nicfit committed Feb 26, 2017
1 parent 4b80780 commit 9a1a095
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 17 deletions.
14 changes: 5 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,11 @@ build:
python setup.py build
${MAKE} -C ./cookiecutter all

clean: clean-local clean-build clean-pyc clean-test clean-patch clean-docs \
clean-gettext
rm -rf tags
${MAKE} -C ./cookiecutter clean
clean: clean-local clean-build clean-pyc clean-test clean-patch clean-docs

clean-local:
@# XXX Add new clean targets here.
-rm tags
${MAKE} -C ./cookiecutter clean
-rm *.log
rm -rf tmp

Expand All @@ -66,6 +64,7 @@ clean-build:
rm -fr .eggs/
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -f {} +
find ./locale -name \*.mo -exec rm {} \;

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
Expand Down Expand Up @@ -126,7 +125,7 @@ clean-docs:
servedocs: docs
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .

pre-release: lint test gettext-po changelog requirements
pre-release: lint test changelog requirements
@echo "VERSION: $(VERSION)"
$(eval RELEASE_TAG = v${VERSION})
@echo "RELEASE_TAG: $(RELEASE_TAG)"
Expand Down Expand Up @@ -268,6 +267,3 @@ gettext-po:

gettext:
pybabel compile --statistics -D nicfit.py -d locale

clean-gettext:
find ./locale -name \*.mo -exec rm {} \;
12 changes: 4 additions & 8 deletions cookiecutter/{{cookiecutter.project_name}}/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,10 @@ help:
build:
python setup.py build

# FIXME: conditional clean-gettext
clean: clean-local clean-build clean-pyc clean-test clean-patch clean-docs \
clean-gettext
rm -rf tags
clean: clean-local clean-build clean-pyc clean-test clean-patch clean-docs

clean-local:
-rm tags
@# XXX Add new clean targets here.

clean-build:
Expand All @@ -63,6 +61,7 @@ clean-build:
rm -fr .eggs/
find . -name '*.egg-info' -exec rm -fr {} +
find . -name '*.egg' -exec rm -f {} +
find ./locale -name \*.mo -exec rm {} \;

clean-pyc:
find . -name '*.pyc' -exec rm -f {} +
Expand Down Expand Up @@ -127,7 +126,7 @@ clean-docs:
servedocs: docs
watchmedo shell-command -p '*.rst' -c '$(MAKE) -C docs html' -R -D .

pre-release: lint test gettext-po changelog requirements
pre-release: lint test changelog requirements
@echo "VERSION: $(VERSION)"
$(eval RELEASE_TAG = v${VERSION})
@echo "RELEASE_TAG: $(RELEASE_TAG)"
Expand Down Expand Up @@ -273,7 +272,4 @@ gettext-po:

gettext:
pybabel compile --statistics -D {{ cookiecutter.gettext_domain }} -d locale

clean-gettext:
find ./locale -name \*.mo -exec rm {} \;
{%- endif %}

0 comments on commit 9a1a095

Please sign in to comment.