提交 1303c865 编写于 作者: C Cleber Rosa

Makefile: add optional (in-tree) plugins to develop target

This will change the behavior one gets with `make develop` so that
optional (but in-tree) plugins will be enabled by default.  For now,
this means enabling the HTML result plugin.

This also means that `make check` will also test those by default,
as it's already been done on Travis CI.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 13039b6f
......@@ -16,8 +16,10 @@ PYTHON26=$(shell $(PYTHON) -V 2>&1 | grep 2.6 -q && echo true || echo false)
VERSION=$(shell $(PYTHON) setup.py --version 2>/dev/null)
DESTDIR=/
AVOCADO_DIRNAME=$(shell echo $${PWD\#\#*/})
AVOCADO_PLUGINS=$(filter-out ../$(AVOCADO_DIRNAME), $(shell find ../ -maxdepth 1 -mindepth 1 -type d))
AVOCADO_PLUGINS+=$(shell find ./optional_plugins -maxdepth 1 -mindepth 1 -type d)
AVOCADO_EXTERNAL_PLUGINS=$(filter-out ../$(AVOCADO_DIRNAME), $(shell find ../ -maxdepth 1 -mindepth 1 -type d))
AVOCADO_OPTIONAL_PLUGINS=$(shell find ./optional_plugins -maxdepth 1 -mindepth 1 -type d)
AVOCADO_PLUGINS=$(AVOCADO_EXTERNAL_PLUGINS)
AVOCADO_PLUGINS+=$(AVOCADO_OPTIONAL_PLUGINS)
RELEASE_COMMIT=$(shell git log --pretty=format:'%H' -n 1 $(VERSION))
RELEASE_SHORT_COMMIT=$(shell git log --pretty=format:'%h' -n 1 $(VERSION))
COMMIT=$(shell git log --pretty=format:'%H' -n 1)
......@@ -152,9 +154,15 @@ modules_boundaries:
develop:
$(PYTHON) setup.py develop $(shell $(PYTHON26) || echo --user)
for MAKEFILE in $(AVOCADO_OPTIONAL_PLUGINS); do\
if test -f $$MAKEFILE/Makefile -o -f $$MAKEFILE/setup.py; then echo ">> LINK $$MAKEFILE";\
if test -f $$MAKEFILE/Makefile; then AVOCADO_DIRNAME=$(AVOCADO_DIRNAME) make -C $$MAKEFILE link &>/dev/null;\
elif test -f $$MAKEFILE/setup.py; then cd $$MAKEFILE; $(PYTHON) setup.py develop $(shell $(PYTHON26) || echo --user); cd -; fi;\
else echo ">> SKIP $$MAKEFILE"; fi;\
done
link: develop
for MAKEFILE in $(AVOCADO_PLUGINS); do\
for MAKEFILE in $(AVOCADO_EXTERNAL_PLUGINS); do\
if test -f $$MAKEFILE/Makefile -o -f $$MAKEFILE/setup.py; then echo ">> LINK $$MAKEFILE";\
if test -f $$MAKEFILE/Makefile; then AVOCADO_DIRNAME=$(AVOCADO_DIRNAME) make -C $$MAKEFILE link &>/dev/null;\
elif test -f $$MAKEFILE/setup.py; then cd $$MAKEFILE; $(PYTHON) setup.py develop $(shell $(PYTHON26) || echo --user); cd -; fi;\
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册