on master help sign in
Makefile: rename target 'searx.brand' to 'buildenv'

And add 'buildenv' as an first order prerequisite to the main targets: - install - run - docs - docs-live - project - node.env - docker - test Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>

commit1ae39787c1d19a6781ad3d5cb0b2615741d9eb4b authorMarkus Heiser <markus.heiser@darmarit.de> dateMon 30 Mar 2020, 12:23 (7 years ago) parentca65d41
1 file changed+12−11
Makefile+12−11
Makefile+12−11
@@ -28,6 +28,7 @@ help:
2828 @echo ' gh-pages - build docs & deploy on gh-pages branch'
2929 @echo ' clean - drop builds and environments'
3030 @echo ' project - re-build generic files of the searx project'
31+ @echo ' buildenv - re-build environment files (aka brand)'
3132 @echo ' themes - re-build build the source of the themes'
3233 @echo ' docker - build Docker image'
3334 @echo ' node.env - download & install npm dependencies locally'
@@ -37,7 +38,7 @@ help:
3738 @$(MAKE) -s -f utils/makefile.python python-help
3839
3940PHONY += install
40−install: pyenvinstall
41+install: buildenv pyenvinstall
4142
4243PHONY += uninstall
4344uninstall: pyenvuninstall
@@ -47,7 +48,7 @@ clean: pyclean node.clean test.clean
4748 $(call cmd,common_clean)
4849
4950PHONY += run
50−run: pyenvinstall
51+run: buildenv pyenvinstall
5152 $(Q) ( \
5253 sed -i -e "s/debug : False/debug : True/g" ./searx/settings.yml ; \
5354 sleep 2 ; \
@@ -61,11 +62,11 @@ run: pyenvinstall
6162# ----
6263
6364PHONY += docs
64−docs: pyenvinstall sphinx-doc
65+docs: buildenv pyenvinstall sphinx-doc
6566 $(call cmd,sphinx,html,docs,docs)
6667
6768PHONY += docs-live
68−docs-live: pyenvinstall sphinx-live
69+docs-live: buildenv pyenvinstall sphinx-live
6970 $(call cmd,sphinx_autobuild,html,docs,docs)
7071
7172$(GH_PAGES)::
@@ -74,9 +75,9 @@ $(GH_PAGES)::
7475# update project files
7576# --------------------
7677
77−PHONY += project engines.languages searx.brand useragents.update
78+PHONY += project engines.languages useragents.update buildenv
7879
79−project: useragents.update engines.languages searx.brand
80+project: buildenv useragents.update engines.languages
8081
8182engines.languages: pyenvinstall
8283 $(Q)echo "fetch languages .."
@@ -90,7 +91,7 @@ useragents.update: pyenvinstall
9091 $(Q)echo "Update searx/data/useragents.json with the most recent versions of Firefox."
9192 $(Q)$(PY_ENV_ACT); python utils/fetch_firefox_version.py
9293
93−searx.brand:
94+buildenv:
9495 $(Q)echo "build searx/brand.py"
9596 $(Q)echo "GIT_URL = '$(GIT_URL)'" > searx/brand.py
9697 $(Q)echo "ISSUE_URL = 'https://github.com/asciimoo/searx/issues'" >> searx/brand.py
@@ -108,7 +109,7 @@ searx.brand:
108109# node / npm
109110# ----------
110111
111−node.env:
112+node.env: buildenv
112113 $(Q)./manage.sh npm_packages
113114
114115node.clean:
@@ -125,7 +126,7 @@ node.clean:
125126# ------------
126127
127128PHONY += themes.bootstrap themes themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
128−themes: themes.bootstrap themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
129+themes: buildenv themes.bootstrap themes.oscar themes.simple themes.legacy themes.courgette themes.pixart
129130
130131quiet_cmd_lessc = LESSC $3
131132 cmd_lessc = PATH="$$(npm bin):$$PATH" \
@@ -165,7 +166,7 @@ themes.bootstrap:
165166# ------
166167
167168PHONY += docker
168−docker:
169+docker: buildenv
169170 $(Q)./manage.sh docker_build
170171
171172# gecko
@@ -180,7 +181,7 @@ gecko.driver:
180181
181182PHONY += test test.pylint test.pep8 test.unit test.coverage test.robot
182183
183−test: test.pylint test.pep8 test.unit gecko.driver test.robot
184+test: buildenv test.pylint test.pep8 test.unit gecko.driver test.robot
184185
185186# TODO: balance linting with pylint
186187test.pylint: pyenvinstall