Skip to content

Commit fcd1d24

Browse files
authored
refactor: moves docker targets help information into docker.mk and also reformats the Makefile help. (#213)
1 parent 1eb19c2 commit fcd1d24

File tree

3 files changed

+25
-21
lines changed

3 files changed

+25
-21
lines changed

Makefile

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@ reinstall: uninstall install
176176
todo-list: clean-all
177177
@grep --color=auto -r -n 'TODO' ./* --exclude=Makefile --exclude-dir=docs
178178

179-
help: help-general help-translate
179+
help: general-help docker-help translate-help
180180

181-
help-general:
181+
general-help:
182182
@echo "Usage:"
183183
@echo " make [targets] [arguments]"
184184
@echo
@@ -195,16 +195,7 @@ help-general:
195195
@echo " clean-cache Delete __pycache__ folders created by pytest framework;"
196196
@echo " clean Remove generated while installing and testing files in the source directory (contains clean-cache);"
197197
@echo " clean-all Remove all generated files such as created docker files, debian and sources (contains clean);"
198-
@echo " help Display this message and exit."
199-
@echo
200-
@echo "Docker:"
201-
@echo " docker-run Runs docker container with installed util;"
202-
@echo " docker-image Build docker image;"
203-
@echo " ALL=[1|0] REBUILD=[1|0]"
204-
@echo " docker-test Runs unit tests with pytest framework in the docker container;"
205-
@echo " docker-autotest Runs autotests in docker container;"
206-
@echo " docker-build-package Build the debian package in special docker image;"
207-
@echo " docker-rmi ALL=[1|0] Delete created docker images."
198+
@echo " help Displays information about all available targets."
208199
@echo
209200

210201

docker/docker.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
docker-help:
2+
@echo "Docker:"
3+
@echo " docker-run Runs docker container with installed util;"
4+
@echo " docker-image Build docker image;"
5+
@echo " ALL=[1|0] REBUILD=[1|0]"
6+
@echo " docker-test Runs unit tests with pytest framework in the docker container;"
7+
@echo " docker-autotest Runs autotests in docker container;"
8+
@echo " docker-build-package Build the debian package in special docker image;"
9+
@echo " docker-rmi ALL=[1|0] Delete created docker images;"
10+
@echo " docker-help Displays information about available docker targets."
11+
@echo
12+
113
docker-base-image: substitute-sources substitute-docker
214
@docker image inspect $(BASE_DOCKER_TAG) > /dev/null 2>&1 || ( \
315
echo "Building base docker image." && \

locales/i18n.mk

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
LOCALES_DIR := locales/
22

33

4+
translate-help:
5+
@echo "Translate:"
6+
@echo " translate-extract Extracts all lines that need to be translated;"
7+
@echo " translate-update Updates all po files with new code changes;"
8+
@echo " translate-compile Compile message catalogs to MO files;"
9+
@echo " translate-init Initializing a new language for translation;"
10+
@echo " LANGUAGE=..."
11+
@echo " translate-help Displays information about available translation targets."
12+
@echo
13+
414
translate-extract:
515
pybabel extract --mapping-file ${LOCALES_DIR}/babel.cfg \
616
--keywords _ \
@@ -32,12 +42,3 @@ translate-init:
3242
echo "You should provide the 'LANGUAGE' variable for initializing translation."; \
3343
exit 1; \
3444
fi
35-
36-
help-translate:
37-
@echo "Translate:"
38-
@echo " translate-extract Extracts all lines that need to be translated;"
39-
@echo " translate-update Updates all po files with new code changes;"
40-
@echo " translate-compile Compile message catalogs to MO files;"
41-
@echo " translate-init Initializing a new language for translation."
42-
@echo " LANGUAGE=..."
43-
@echo

0 commit comments

Comments
 (0)