anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Improve Makefile

Browse source 
The PYTHONPATH is now set centrally, except for the tests.
Environment for the tests is prepared using target-specific variables.
https://www.gnu.org/software/make/manual/make.html#Target_002dspecific

To ensure exiting on command failure, "set -e" is added before loops,
and otherwise ";" is replaced with "&&" between commands.
https://www.debian.org/doc/debian-policy/ch-source.html#error-trapping-in-makefiles

"mkdir -p" does not need an existence test beforehand.

Changed all python invocations to python3.

LANG and PYSOL_DEBUG were never exported so they probably had no effect.
Removed for simplicity.
This commit is contained in:
Juhani Numminen 2019-07-18 17:55:28 +03:00 • committed by Shlomi Fish
parent 0b5698dff0
commit 1b89ae2346
1 changed files with 19 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
Makefile
View file

@ -1,44 +1,42 @@
# Makefile for PySolFC # Makefile for PySolFC
override LANG=C export PYTHONPATH := $(PYTHONPATH):$(CURDIR)
override PYSOL_DEBUG=1
PYSOLLIB_FILES=pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \ PYSOLLIB_FILES = pysollib/tk/*.py pysollib/tile/*.py pysollib/*.py \
pysollib/games/*.py pysollib/games/special/*.py \ pysollib/games/*.py pysollib/games/special/*.py \
pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py \ pysollib/games/ultra/*.py pysollib/games/mahjongg/*.py \
pysollib/kivy/*.py pysollib/kivy/*.py
.PHONY : all install dist all_games_html rules pot mo .PHONY: all install dist rpm all_games_html rules pot mo pretest test runtest
all: all:
@echo "No default target" @echo "No default target"
install: install:
python setup.py install python3 setup.py install
dist: all_games_html rules mo dist: all_games_html rules mo
python3 setup.py sdist python3 setup.py sdist
rpm: all_games_html rules mo rpm: all_games_html rules mo
python setup.py bdist_rpm python3 setup.py bdist_rpm
all_games_html: rules all_games_html: rules
export PYTHONPATH="$(PYTHONPATH):$(CURDIR)" \ cd data/html && $(CURDIR)/scripts/all_games.py html id rules > all_games.html
&& cd data/html \
&& $(CURDIR)/scripts/all_games.py html id rules > all_games.html
rules: rules:
export PYTHONPATH=`pwd`; (cd html-src && ./gen-html.py) cd html-src && ./gen-html.py
cp -r html-src/images html-src/html cp -r html-src/images html-src/html
rm -rf data/html rm -rf data/html
mv html-src/html data mv html-src/html data
pot: pot:
PYTHONPATH=`pwd` ./scripts/all_games.py gettext > po/games.pot ./scripts/all_games.py gettext > po/games.pot
PYTHONPATH=`pwd` ./scripts/pygettext.py -k n_ --ngettext-keyword ungettext -o po/pysol-1.pot $(PYSOLLIB_FILES) ./scripts/pygettext.py -k n_ --ngettext-keyword ungettext -o po/pysol-1.pot $(PYSOLLIB_FILES)
xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations xgettext -L C --keyword=N_ -o po/pysol-2.pot data/glade-translations
msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot msgcat po/pysol-1.pot po/pysol-2.pot > po/pysol.pot
rm -f po/pysol-1.pot po/pysol-2.pot rm -f po/pysol-1.pot po/pysol-2.pot
set -e; \
for lng in ru pl; do \ for lng in ru pl; do \
mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \ mv -f po/$${lng}_pysol.po po/$${lng}_pysol.old.po; \
msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \ msgmerge po/$${lng}_pysol.old.po po/pysol.pot > po/$${lng}_pysol.po; \
@ -49,30 +47,28 @@ pot:
done done
mo: mo:
for loc in ru de pl it; do \ set -e; \
test -d locale/$${loc}/LC_MESSAGES || mkdir -p locale/$${loc}/LC_MESSAGES; \
done
for lang in ru pl it; do \ for lang in ru pl it; do \
msgcat --use-first po/$${lang}_games.po po/$${lang}_pysol.po > po/$${lang}.po 2>/dev/null; \ msgcat --use-first po/$${lang}_games.po po/$${lang}_pysol.po > po/$${lang}.po 2>/dev/null; \
done done
set -e; \
for lang in ru de pl it; do \ for lang in ru de pl it; do \
mkdir -p locale/$${lang}/LC_MESSAGES; \
msgfmt -o locale/$${lang}/LC_MESSAGES/pysol.mo po/$${lang}.po; \ msgfmt -o locale/$${lang}/LC_MESSAGES/pysol.mo po/$${lang}.po; \
done done
pretest: pretest:
@rm -f tests/individually-importing/*.py # To avoid stray files rm -f tests/individually-importing/*.py # To avoid stray files
python3 scripts/gen_individual_importing_tests.py python3 scripts/gen_individual_importing_tests.py
TEST_ENV_PATH = "`pwd`:`pwd`/tests/lib" TEST_ENV_PATH = $(CURDIR):$(CURDIR)/tests/lib
TEST_ENV = PYTHONPATH="$$PYTHONPATH:"$(TEST_ENV_PATH) PERL5LIB="$$PERL5LIB:"$(TEST_ENV_PATH)
TEST_FILES = tests/style/*.t tests/unit-generated/*.py tests/individually-importing/*.py TEST_FILES = tests/style/*.t tests/unit-generated/*.py tests/individually-importing/*.py
define RUN_TESTS test runtest: export PYTHONPATH := $(PYTHONPATH):$(TEST_ENV_PATH)
$(TEST_ENV) $1 $(TEST_FILES) test runtest: export PERL5LIB := $(PERL5LIB):$(TEST_ENV_PATH)
endef
test: pretest test: pretest
$(call RUN_TESTS,prove) prove $(TEST_FILES)
runtest: pretest runtest: pretest
$(call RUN_TESTS,runprove) runprove $(TEST_FILES)