$(docpng) \
$(maninput) \
doc/install-quick.rst \
- doc/news.rst
+ doc/news.rst \
+ vcs-version
maintainer-clean-local:
rm -rf $(BUILDTIME_DIRS)
lib/locking.py \
lib/luxi.py \
lib/mcpu.py \
+ lib/netutils.py \
lib/objects.py \
lib/opcodes.py \
lib/rpc.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 \
tools/cluster-merge \
tools/lvmstrap \
tools/move-instance \
+ tools/setup-ssh \
tools/sanitize-config
pkglib_python_scripts = \
$(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.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
@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 stamp-directories vcs-version
+ set -e; \
+ VCSVER=`cat $(abs_top_srcdir)/vcs-version`; \
{ echo '# This file is automatically generated, do not edit!'; \
echo '#'; \
echo ''; \
echo "DAEMONS_GROUP = '$(DAEMONS_GROUP)'"; \
echo "MASTERD_USER = '$(MASTERD_USER)'"; \
echo "RAPI_USER = '$(RAPI_USER)'"; \
+ echo "VCS_VERSION = '$$VCSVER'"; \
} > $@
$(REPLACE_VARS_SED): Makefile
.PHONY: check-dirs
check-dirs: $(BUILT_SOURCES)
- set -e; \
+ @set -e; \
find . -type d \( \( -name . \) -o \( \
-name .git -o \
-name autom4te.cache \
@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; \
.PHONY: TAGS
TAGS: $(BUILT_SOURCES)
rm -f TAGS
- find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
- -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+ find . -path './lib/*.py' -o -path './scripts/gnt-*' -o \
+ -path './daemons/ganeti-*' -o -path './tools/*' -o \
+ -path './qa/*.py' | \
etags -
.PHONY: coverage
commit-check: distcheck lint apidoc
+-include ./Makefile.local
+
# vim: set noet :