abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+# Helper values for calling builtin functions
+empty :=
+space := $(empty) $(empty)
+comma := ,
+
# Use bash in order to be able to use pipefail
SHELL=/bin/bash
CHECK_MAN = $(top_srcdir)/autotools/check-man
CHECK_VERSION = $(top_srcdir)/autotools/check-version
CHECK_NEWS = $(top_srcdir)/autotools/check-news
+CHECK_IMPORTS = $(top_srcdir)/autotools/check-imports
DOCPP = $(top_srcdir)/autotools/docpp
REPLACE_VARS_SED = autotools/replace_vars.sed
CONVERT_CONSTANTS = $(top_srcdir)/autotools/convert-constants
BUILT_SOURCES = \
ganeti \
stamp-srclinks \
- lib/_autoconf.py \
- lib/_vcsversion.py \
$(all_dirfiles) \
- $(PYTHON_BOOTSTRAP)
+ $(PYTHON_BOOTSTRAP) \
+ $(BUILT_PYTHON_SOURCES)
-nodist_pkgpython_PYTHON = \
+BUILT_PYTHON_SOURCES = \
lib/_autoconf.py \
lib/_vcsversion.py
+nodist_pkgpython_PYTHON = \
+ $(BUILT_PYTHON_SOURCES)
+
noinst_PYTHON = \
lib/build/__init__.py \
lib/build/sphinx_ext.py
doc/design-2.3.rst \
doc/design-htools-2.3.rst \
doc/design-2.4.rst \
+ doc/design-2.5.rst \
doc/design-draft.rst \
doc/design-oob.rst \
doc/design-cpu-pinning.rst \
doc/design-multi-reloc.rst \
doc/design-network.rst \
doc/design-chained-jobs.rst \
+ doc/design-ovf-support.rst \
doc/cluster-merge.rst \
doc/design-shared-storage.rst \
doc/devnotes.rst \
# it changes
doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
$(RUN_IN_TEMPDIR) lib/build/sphinx_ext.py lib/opcodes.py lib/ht.py \
- | lib/_autoconf.py lib/_vcsversion.py
+ | $(BUILT_PYTHON_SOURCES)
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
@mkdir_p@ $(dir $@)
bin_SCRIPTS += $(filter-out htools/hail,$(HS_PROGS))
install-exec-hook:
@mkdir_p@ $(DESTDIR)$(iallocatorsdir)
- $(LN_S) -f $(DESTDIR)$(bindir)/htools \
+# FIXME: this is a hardcoded logic, instead of auto-resolving
+ $(LN_S) -f ../../../bin/htools \
$(DESTDIR)$(iallocatorsdir)/hail
for role in $(HS_BIN_ROLES); do \
- $(LN_S) -f $(DESTDIR)$(bindir)/htools \
+ $(LN_S) -f htools \
$(DESTDIR)$(bindir)/$$role ; \
done
endif
pylintrc \
autotools/build-bash-completion \
autotools/check-python-code \
+ autotools/check-imports \
autotools/check-man \
autotools/check-news \
autotools/check-tar \
test/data/bdev-drbd-net-ip4.txt \
test/data/bdev-drbd-net-ip6.txt \
test/data/cert1.pem \
+ test/data/ip-addr-show-dummy0.txt \
+ test/data/ip-addr-show-lo-ipv4.txt \
+ test/data/ip-addr-show-lo-ipv6.txt \
+ test/data/ip-addr-show-lo-oneline-ipv4.txt \
+ test/data/ip-addr-show-lo-oneline-ipv6.txt \
+ test/data/ip-addr-show-lo-oneline.txt \
+ test/data/ip-addr-show-lo.txt \
test/data/proc_drbd8.txt \
test/data/proc_drbd80-emptyline.txt \
test/data/proc_drbd83.txt \
check_python_code = \
$(BUILD_BASH_COMPLETION) \
+ $(CHECK_IMPORTS) \
$(DOCPP) \
$(all_python_code)
$(dist_tools_PYTHON) \
$(pkglib_python_scripts) \
$(BUILD_BASH_COMPLETION) \
+ $(CHECK_IMPORTS) \
$(DOCPP) \
$(PYTHON_BOOTSTRAP)
+standalone_python_modules = \
+ lib/rapi/client.py \
+ tools/ganeti-listrunner
+
test/daemon-util_unittest.bash: daemons/daemon-util
test/ganeti-cleaner_unittest.bash: daemons/ganeti-cleaner
echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
echo "KVM_PATH = '$(KVM_PATH)'"; \
+ echo "IP_PATH = '$(IP_PATH)'"; \
echo "SOCAT_PATH = '$(SOCAT)'"; \
echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
echo "SOCAT_USE_COMPRESS = $(SOCAT_USE_COMPRESS)"; \
if test -n "$$error"; then exit 1; else exit 0; fi; \
}
-check-local: check-dirs
+.PHONY: check-local
+check-local: check-dirs $(BUILT_SOURCES)
$(CHECK_PYTHON_CODE) $(check_python_code)
$(CHECK_VERSION) $(VERSION) $(top_srcdir)/NEWS
$(CHECK_NEWS) < $(top_srcdir)/NEWS
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(CHECK_IMPORTS) . $(standalone_python_modules)
expver=$(VERSION_MAJOR).$(VERSION_MINOR); \
if test "`head -n 1 $(top_srcdir)/README`" != "Ganeti $$expver"; then \
echo "Incorrect version in README, expected $$expver"; \
exit 1; \
fi; \
- if test "`sed -ne '4 p' $(top_srcdir)/doc/iallocator.rst`" != \
- "Documents Ganeti version $$expver"; then \
- echo "Incorrect version in iallocator.rst, expected $$expver"; \
- exit 1; \
- fi
+ for file in doc/iallocator.rst doc/hooks.rst; do \
+ if test "`sed -ne '4 p' $(top_srcdir)/$$file`" != \
+ "Documents Ganeti version $$expver"; then \
+ echo "Incorrect version in $$file, expected $$expver"; \
+ exit 1; \
+ fi; \
+ done
.PHONY: hs-check
hs-check: htools/test
@rm -f test.tix
./htools/test
+# E111: indentation is not a multiple of four
+# E261: at least two spaces before inline comment
+# E501: line too long (80 characters)
+PEP8_IGNORE = E111,E261,E501
+
+# For excluding pep8 expects filenames only, not whole paths
+PEP8_EXCLUDE = $(subst $(space),$(comma),$(strip $(notdir $(BUILT_PYTHON_SOURCES))))
+
.PHONY: lint
lint: $(BUILT_SOURCES)
@test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
+ if test -z "$(PEP8)"; then \
+ echo '"pep8" not found during configure' >&2; \
+ else \
+ $(PEP8) --repeat --ignore='$(PEP8_IGNORE)' --exclude='$(PEP8_EXCLUDE)' \
+ $(lint_python_code); \
+ fi
$(PYLINT) $(LINT_OPTS) $(lint_python_code)
cd $(top_srcdir)/qa && \
PYTHONPATH=$(abs_top_srcdir) $(PYLINT) $(LINT_OPTS) \