CHECK_MAN = $(top_srcdir)/autotools/check-man
REPLACE_VARS_SED = autotools/replace_vars.sed
+clientdir = $(pkgpythondir)/client
hypervisordir = $(pkgpythondir)/hypervisor
httpdir = $(pkgpythondir)/http
masterddir = $(pkgpythondir)/masterd
doc \
doc/examples \
doc/examples/hooks \
+ doc/examples/gnt-debug \
lib \
+ lib/client \
lib/build \
lib/confd \
lib/http \
lib/rapi \
man \
qa \
- scripts \
test \
test/data \
tools
+BUILDTIME_DIRS = \
+ scripts \
+ doc/api \
+ doc/coverage \
+ doc/html
+
+DIRCHECK_EXCLUDE = \
+ $(BUILDTIME_DIRS) \
+ ganeti-[0-9]*.[0-9]*.[0-9]* \
+ doc/html/_*
+
+all_dirfiles = $(addsuffix /.dir,$(DIRS) $(BUILDTIME_DIRS))
+
MAINTAINERCLEANFILES = \
$(docpng) \
$(maninput) \
doc/install-quick.rst \
- doc/news.rst
+ doc/news.rst \
+ vcs-version
maintainer-clean-local:
- rm -rf doc/api doc/html doc/coverage
+ rm -rf $(BUILDTIME_DIRS)
CLEANFILES = \
$(addsuffix /*.py[co],$(DIRS)) \
+ $(all_dirfiles) \
+ $(PYTHON_BOOTSTRAP) \
autotools/replace_vars.sed \
daemons/daemon-util \
daemons/ensure-dirs \
doc/examples/hooks/ipsec \
$(man_MANS) \
$(manhtml) \
- stamp-directories \
stamp-srclinks \
$(nodist_pkgpython_PYTHON)
+# BUILT_SOURCES should only be used as a dependency on phony targets. Otherwise
+# it'll cause the target to rebuild every time.
BUILT_SOURCES = \
ganeti \
stamp-srclinks \
- stamp-directories \
- lib/_autoconf.py
+ lib/_autoconf.py \
+ $(all_dirfiles) \
+ $(PYTHON_BOOTSTRAP)
nodist_pkgpython_PYTHON = \
lib/_autoconf.py
lib/constants.py \
lib/daemon.py \
lib/errors.py \
+ lib/ht.py \
lib/jqueue.py \
lib/jstore.py \
lib/locking.py \
lib/luxi.py \
lib/mcpu.py \
+ lib/netutils.py \
lib/objects.py \
lib/opcodes.py \
lib/rpc.py \
+ lib/runtime.py \
lib/serializer.py \
lib/ssconf.py \
lib/ssh.py \
lib/uidpool.py \
lib/workerpool.py
+client_PYTHON = \
+ lib/client/__init__.py \
+ lib/client/gnt_backup.py \
+ lib/client/gnt_cluster.py \
+ lib/client/gnt_debug.py \
+ lib/client/gnt_instance.py \
+ lib/client/gnt_job.py \
+ lib/client/gnt_node.py \
+ lib/client/gnt_os.py
+
hypervisor_PYTHON = \
lib/hypervisor/__init__.py \
lib/hypervisor/hv_base.py \
lib/hypervisor/hv_chroot.py \
lib/hypervisor/hv_fake.py \
lib/hypervisor/hv_kvm.py \
+ lib/hypervisor/hv_lxc.py \
lib/hypervisor/hv_xen.py
rapi_PYTHON = \
doc/design-2.0.rst \
doc/design-2.1.rst \
doc/design-2.2.rst \
- doc/design-cluster-merger.rst \
+ doc/design-2.3.rst \
+ doc/cluster-merge.rst \
doc/devnotes.rst \
doc/glossary.rst \
doc/hooks.rst \
doc/security.rst \
doc/walkthrough.rst
-doc/html/.stamp: $(docrst) $(docpng) doc/conf.py configure.ac
+$(RUN_IN_TEMPDIR): | $(all_dirfiles)
+
+doc/html/index.html: $(docrst) $(docpng) doc/conf.py configure.ac \
+ $(RUN_IN_TEMPDIR) | doc/html/.dir
@test -n "$(SPHINX)" || \
{ echo 'sphinx-build' not found during configure; exit 1; }
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
rm -f doc/html/.buildinfo doc/html/objects.inv
touch $@
-doc/html: doc/html/.stamp
+doc/html: doc/html/index.html
doc/news.rst: NEWS
set -e; \
scripts/gnt-node \
scripts/gnt-os
+PYTHON_BOOTSTRAP = \
+ scripts/gnt-backup \
+ scripts/gnt-cluster \
+ scripts/gnt-debug \
+ scripts/gnt-instance \
+ scripts/gnt-job \
+ scripts/gnt-node \
+ scripts/gnt-os
+
dist_sbin_SCRIPTS = \
daemons/ganeti-noded \
daemons/ganeti-watcher \
daemons/ganeti-masterd \
daemons/ganeti-confd \
- daemons/ganeti-rapi \
- $(gnt_scripts)
+ daemons/ganeti-rapi
nodist_sbin_SCRIPTS = \
+ $(PYTHON_BOOTSTRAP) \
daemons/ganeti-cleaner
dist_tools_SCRIPTS = \
tools/cluster-merge \
tools/lvmstrap \
tools/move-instance \
+ tools/setup-ssh \
tools/sanitize-config
pkglib_python_scripts = \
doc/examples/ganeti.default-debug \
doc/examples/hooks/ethers \
doc/examples/hooks/ipsec.in \
+ doc/examples/gnt-debug/README \
+ doc/examples/gnt-debug/delay0.json \
+ doc/examples/gnt-debug/delay50.json \
test/testutils.py \
test/mocks.py \
$(dist_TESTS) \
$(patsubst %.html,%.html.in,$(manhtml))
TEST_FILES = \
- test/data/bdev-both.txt \
- test/data/bdev-8.3-both.txt \
- test/data/bdev-disk.txt \
- test/data/bdev-net.txt \
+ test/data/bdev-drbd-8.0.txt \
+ test/data/bdev-drbd-8.3.txt \
+ test/data/bdev-drbd-disk.txt \
+ test/data/bdev-drbd-net-ip4.txt \
+ test/data/bdev-drbd-net-ip6.txt \
test/data/cert1.pem \
test/data/proc_drbd8.txt \
test/data/proc_drbd80-emptyline.txt \
test/data/proc_drbd83.txt \
+ test/data/sys_drbd_usermode_helper.txt \
test/import-export_unittest-helper
python_tests = \
test/ganeti.errors_unittest.py \
test/ganeti.hooks_unittest.py \
test/ganeti.http_unittest.py \
+ test/ganeti.hypervisor.hv_kvm_unittest.py \
test/ganeti.impexpd_unittest.py \
+ test/ganeti.jqueue_unittest.py \
test/ganeti.locking_unittest.py \
test/ganeti.luxi_unittest.py \
test/ganeti.masterd.instance_unittest.py \
test/ganeti.mcpu_unittest.py \
+ test/ganeti.netutils_unittest.py \
test/ganeti.objects_unittest.py \
test/ganeti.opcodes_unittest.py \
test/ganeti.rapi.client_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.rapi.rlib2_unittest.py \
+ test/ganeti.rpc_unittest.py \
+ test/ganeti.runtime_unittest.py \
test/ganeti.serializer_unittest.py \
test/ganeti.ssh_unittest.py \
test/ganeti.uidpool_unittest.py \
test/ganeti.utils_unittest.py \
test/ganeti.utils_mlockall_unittest.py \
test/ganeti.workerpool_unittest.py \
+ test/cfgupgrade_unittest.py \
test/docs_unittest.py \
test/tempfile_fork_unittest.py
$(pkglib_python_scripts) \
$(python_tests) \
$(pkgpython_PYTHON) \
+ $(client_PYTHON) \
$(hypervisor_PYTHON) \
$(rapi_PYTHON) \
$(http_PYTHON) \
lint_python_code = \
ganeti \
+ ganeti/http/server.py \
$(dist_sbin_SCRIPTS) \
$(dist_tools_SCRIPTS) \
$(pkglib_python_scripts) \
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
-daemons/%: daemons/%.in \
- $(REPLACE_VARS_SED)
+daemons/%: daemons/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod +x $@
-doc/examples/%: doc/examples/%.in \
- $(REPLACE_VARS_SED)
+doc/examples/%: doc/examples/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-doc/examples/hooks/%: doc/examples/hooks/%.in \
- $(REPLACE_VARS_SED)
+doc/examples/hooks/%: doc/examples/hooks/%.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
- lib/cli.py $(gnt_scripts) tools/burnin
+ lib/cli.py $(gnt_scripts) $(client_PYTHON) tools/burnin
PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
doc/%.png: doc/%.dot
@test -n "$(DOCBOOK2MAN)" || \
{ echo 'docbook2man' not found during configure; exit 1; }
$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
- $(CHECK_MAN) $@
+ if test -n "$(MAN_HAS_WARNINGS)"; then $(CHECK_MAN) $@; fi
man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
@test -n "$(DOCBOOK2HTML)" || \
man/%.html: man/%.html.in $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-lib/_autoconf.py: Makefile stamp-directories
+vcs-version:
+ if test -d .git; then \
+ git describe > $@; \
+ elif test ! -f $@ ; then \
+ echo "Cannot auto-generate $@ file"; exit 1; \
+ fi
+
+.PHONY: regen-vcs-version
+regen-vcs-version:
+ set -e; \
+ cd $(srcdir); \
+ if test -d .git; then \
+ rm -f vcs-version; \
+ $(MAKE) vcs-version; \
+ fi
+
+lib/_autoconf.py: Makefile vcs-version | lib/.dir
set -e; \
+ VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
{ echo '# This file is automatically generated, do not edit!'; \
echo '#'; \
echo ''; \
echo "DRBD_BARRIERS = $(DRBD_BARRIERS)"; \
echo "SYSLOG_USAGE = '$(SYSLOG_USAGE)'"; \
echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
+ echo "ADMIN_GROUP = '$(ADMIN_GROUP)'"; \
echo "MASTERD_USER = '$(MASTERD_USER)'"; \
+ echo "MASTERD_GROUP = '$(MASTERD_GROUP)'"; \
echo "RAPI_USER = '$(RAPI_USER)'"; \
+ echo "RAPI_GROUP = '$(RAPI_GROUP)'"; \
+ echo "CONFD_USER = '$(CONFD_USER)'"; \
+ echo "CONFD_GROUP = '$(CONFD_GROUP)'"; \
+ echo "NODED_USER = '$(NODED_USER)'"; \
+ echo "VCS_VERSION = '$$VCSVER'"; \
} > $@
$(REPLACE_VARS_SED): Makefile
echo 's#@GNTDAEMONSGROUP@#$(DAEMONS_GROUP)#g'; \
} > $@
+$(PYTHON_BOOTSTRAP): Makefile | $(all_dirfiles)
+ set -e; \
+ module='$(subst -,_,$(notdir $@))'; \
+ { echo '#!/usr/bin/python'; \
+ echo '# This file is automatically generated, do not edit!'; \
+ echo "# Edit ganeti.client.$$module instead."; \
+ echo; \
+ echo '"""Bootstrap script for L{ganeti.client.'"$$module"'}"""'; \
+ echo; \
+ echo '# pylint: disable-msg=C0103'; \
+ echo '# C0103: Invalid name'; \
+ echo; \
+ echo 'import sys'; \
+ echo "from ganeti.client import $$module"; \
+ echo; \
+ echo '# Temporarily alias commands until bash completion'; \
+ echo '# generator is changed'; \
+ echo "if hasattr($$module, \"commands\"):"; \
+ echo " commands = $$module.commands"; \
+ echo; \
+ echo 'if __name__ == "__main__":'; \
+ echo " sys.exit($$module.Main())"; \
+ } > $@
+ chmod u+x $@
+
# We need to create symlinks because "make distcheck" will not install Python
# files when building.
-stamp-srclinks: Makefile stamp-directories
+stamp-srclinks: Makefile | $(all_dirfiles)
set -e; \
for i in $(srclink_files); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
ganeti:
cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
-check-local:
+.PHONY: check-dirs
+check-dirs: $(BUILT_SOURCES)
+ @set -e; \
+ find . -type d \( \( -name . \) -o \( \
+ -name .git -o \
+ -name autom4te.cache \
+ \) -prune -o -print \) | { \
+ error=; \
+ while read dir; do \
+ case "$$dir" in \
+ $(strip $(patsubst %,(./%) ;;,$(DIRCHECK_EXCLUDE) $(DIRS))) \
+ *) error=1; echo "Directory $$dir not listed in Makefile" >&2 ;; \
+ esac; \
+ done; \
+ for dir in $(DIRS); do \
+ if ! test -d "$$dir"; then \
+ echo "Directory $$dir listed in DIRS does not exist" >&2; \
+ error=1; \
+ fi \
+ done; \
+ if test -n "$$error"; then exit 1; else exit 0; fi; \
+ }
+
+check-local: check-dirs
$(CHECK_PYTHON_CODE) $(check_python_code)
.PHONY: lint
-lint: ganeti $(BUILT_SOURCES)
+lint: $(BUILT_SOURCES)
@test -n "$(PYLINT)" || { echo 'pylint' not found during configure; exit 1; }
$(PYLINT) $(LINT_OPTS) $(lint_python_code)
-# a dist hook rule for catching revision control directories
+# a dist hook rule for updating the vcs-version file; this is
+# hardcoded due to where it needs to build the file...
+dist-hook:
+ $(MAKE) regen-vcs-version && \
+ rm -f $(top_distdir)/vcs-version && \
+ cp -p $(srcdir)/vcs-version $(top_distdir)
+
+# a distcheck hook rule for catching revision control directories
distcheck-hook:
if find $(top_distdir) -name .svn -or -name .git | grep .; then \
echo "Found revision control files in final archive." 1>&2; \
"$(DESTDIR)${localstatedir}/log/ganeti" \
"$(DESTDIR)${localstatedir}/run/ganeti"
-stamp-directories: Makefile
- @mkdir_p@ $(DIRS)
- touch $@
+# To avoid conflicts between directory names and other targets, a file inside
+# the directory is used to ensure its existence.
+%.dir:
+ @mkdir_p@ $* && touch $@
.PHONY: apidoc
apidoc: epydoc.conf $(RUN_IN_TEMPDIR) $(BUILT_SOURCES)
- test -e doc/api || mkdir doc/api
$(RUN_IN_TEMPDIR) epydoc -v \
--conf $(CURDIR)/epydoc.conf \
--output $(CURDIR)/doc/api
.PHONY: TAGS
TAGS: $(BUILT_SOURCES)
rm -f TAGS
- find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
- -path 'daemons/ganeti-*' -o -path 'tools/*' | \
- etags -
+ find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
+ -path './daemons/ganeti-*' -o -path './tools/*' -o \
+ -path './qa/*.py' | \
+ etags -l python -
.PHONY: coverage
coverage: $(BUILT_SOURCES) $(python_tests)
set -e; \
- mkdir -p doc/coverage; \
COVERAGE_FILE=$(CURDIR)/doc/coverage/data \
TEXT_COVERAGE=$(CURDIR)/doc/coverage/report.txt \
HTML_COVERAGE=$(CURDIR)/doc/coverage \
commit-check: distcheck lint apidoc
+-include ./Makefile.local
+
# vim: set noet :
projects / ganeti-local / blobdiff