ACLOCAL_AMFLAGS = -I autotools
DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
-BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
+BUILD_BASH_COMPLETION = $(top_srcdir)/autotools/build-bash-completion
+RUN_IN_TEMPDIR = $(top_srcdir)/autotools/run-in-tempdir
+CHECK_PYTHON_CODE = $(top_srcdir)/autotools/check-python-code
REPLACE_VARS_SED = autotools/replace_vars.sed
hypervisordir = $(pkgpythondir)/hypervisor
httpdir = $(pkgpythondir)/http
+confddir = $(pkgpythondir)/confd
rapidir = $(pkgpythondir)/rapi
toolsdir = $(pkglibdir)/tools
docdir = $(datadir)/doc/$(PACKAGE)
doc/examples \
doc/examples/hooks \
lib \
+ lib/build \
lib/http \
lib/hypervisor \
lib/rapi \
+ lib/confd \
man \
qa \
scripts \
tools
MAINTAINERCLEANFILES = \
- $(dochtml) \
- $(patsubst %.dot,%.png,$(docdot)) \
+ $(docpng) \
$(maninput)
+maintainer-clean-local:
+ -rm -rf doc/api doc/build doc/html
+
CLEANFILES = \
autotools/replace_vars.sed \
daemons/ganeti-cleaner \
devel/upload \
- doc/rapi-resources.gen \
doc/examples/bash_completion \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
+ doc/examples/hooks/ipsec \
lib/*.py[co] \
+ lib/build/*.py[co] \
lib/http/*.py[co] \
lib/hypervisor/*.py[co] \
lib/rapi/*.py[co] \
stamp-directories \
$(nodist_pkgpython_PYTHON)
+BUILT_SOURCES = \
+ ganeti \
+ srclinks \
+ lib/_autoconf.py
+
nodist_pkgpython_PYTHON = \
lib/_autoconf.py
+noinst_PYTHON = \
+ lib/build/__init__.py
+
pkgpython_PYTHON = \
lib/__init__.py \
+ lib/asyncnotifier.py \
lib/backend.py \
lib/bdev.py \
lib/bootstrap.py \
lib/serializer.py \
lib/ssconf.py \
lib/ssh.py \
+ lib/storage.py \
lib/utils.py \
lib/workerpool.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_xen.py
lib/http/client.py \
lib/http/server.py
+confd_PYTHON = \
+ lib/confd/__init__.py \
+ lib/confd/client.py \
+ lib/confd/server.py \
+ lib/confd/querylib.py
docrst = \
doc/admin.rst \
doc/design-2.0.rst \
+ doc/design-2.1.rst \
+ doc/devnotes.rst \
+ doc/glossary.rst \
doc/hooks.rst \
doc/iallocator.rst \
+ doc/index.rst \
doc/install.rst \
+ doc/locking.rst \
+ doc/rapi.rst \
doc/security.rst
-dochtml = $(patsubst %.rst,%.html,$(docrst))
+doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+ @test -n "$(SPHINX)" || \
+ { echo 'sphinx-build' not found during configure; exit 1; }
+ mkdir -p doc/build/doctrees
+ PYTHONPATH=.:$(top_builddir) sphinx-build -q -b html \
+ -d doc/build/doctrees \
+ -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
+ -D release="$(PACKAGE_VERSION)" \
+ $(top_srcdir)/doc doc/html
+ touch "$@"
docdot = \
- doc/arch-2.0.dot
+ doc/arch-2.0.dot \
+ doc/design-2.1-lock-acquire.dot \
+ doc/design-2.1-lock-release.dot
-doc_DATA = $(dochtml)
+docpng = $(patsubst %.dot,%.png,$(docdot))
-noinst_DATA = $(manhtml)
+noinst_DATA = $(manhtml) doc/html
-dist_sbin_SCRIPTS = \
- daemons/ganeti-noded \
- daemons/ganeti-watcher \
- daemons/ganeti-masterd \
- daemons/ganeti-rapi \
+gnt_scripts = \
scripts/gnt-backup \
scripts/gnt-cluster \
scripts/gnt-debug \
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)
+
nodist_sbin_SCRIPTS = \
daemons/ganeti-cleaner
EXTRA_DIST = \
$(MAINTAINERCLEANFILES) \
NEWS \
- DEVNOTES \
pylintrc \
+ autotools/build-bash-completion \
+ autotools/check-python-code \
autotools/docbook-wrapper \
+ autotools/run-in-tempdir \
daemons/ganeti-cleaner.in \
devel/upload.in \
- $(docrst) \
$(docdot) \
- doc/build-rapi-resources-doc \
- doc/examples/bash_completion.in \
+ $(docrst) \
+ doc/conf.py \
+ doc/html \
doc/examples/ganeti.initd.in \
doc/examples/ganeti.cron.in \
doc/examples/dumb-allocator \
doc/examples/hooks/ethers \
- doc/locking.txt \
+ doc/examples/hooks/ipsec.in \
test/testutils.py \
test/mocks.py \
$(dist_TESTS) \
test/ganeti.bdev_unittest.py \
test/ganeti.cli_unittest.py \
test/ganeti.cmdlib_unittest.py \
+ test/ganeti.confd_client_unittest.py \
test/ganeti.config_unittest.py \
test/ganeti.constants_unittest.py \
test/ganeti.hooks_unittest.py \
test/ganeti.http_unittest.py \
test/ganeti.locking_unittest.py \
+ test/ganeti.mcpu_unittest.py \
+ test/ganeti.objects_unittest.py \
test/ganeti.rapi.resources_unittest.py \
test/ganeti.serializer_unittest.py \
test/ganeti.ssh_unittest.py \
test/ganeti.utils_unittest.py \
- test/ganeti.workerpool_unittest.py
+ test/ganeti.workerpool_unittest.py \
+ test/docs_unittest.py
nodist_TESTS =
TESTS = $(dist_TESTS) $(nodist_TESTS)
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
+TESTS_ENVIRONMENT = \
+ PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
+ $(RUN_IN_TEMPDIR) $(PYTHON)
-RAPI_RESOURCES = $(wildcard lib/rapi/*.py)
+all_python_code = \
+ $(dist_sbin_SCRIPTS) \
+ $(dist_tools_SCRIPTS) \
+ $(dist_TESTS) \
+ $(pkgpython_PYTHON) \
+ $(hypervisor_PYTHON) \
+ $(rapi_PYTHON) \
+ $(http_PYTHON) \
+ $(confd_PYTHON) \
+ $(noinst_PYTHON)
+
+srclink_files = \
+ man/footer.sgml \
+ $(all_python_code)
-all-local: stamp-directories lib/_autoconf.py devel/upload \
+check_python_code = \
+ $(all_python_code)
+
+all-local: stamp-directories devel/upload \
doc/examples/bash_completion \
- doc/examples/ganeti.initd doc/examples/ganeti.cron
+ doc/examples/ganeti.initd doc/examples/ganeti.cron \
+ doc/examples/hooks/ipsec
devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
chmod u+x $@
+daemons/ganeti-cleaner: daemons/ganeti-cleaner.in stamp-directories \
+ $(REPLACE_VARS_SED)
+ sed -f $(REPLACE_VARS_SED) < $< > $@
+ chmod +x $@
+
doc/examples/%: doc/examples/%.in stamp-directories \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-daemons/ganeti-cleaner: daemons/ganeti-cleaner.in stamp-directories \
+doc/examples/hooks/%: doc/examples/hooks/%.in stamp-directories \
$(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
- chmod +x $@
-doc/%.html: doc/%.rst
- @test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; }
- $(RST2HTML) $< $@
+doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
+ lib/cli.py $(gnt_scripts) tools/burnin
+ PYTHONPATH=. $(RUN_IN_TEMPDIR) $(CURDIR)/$(BUILD_BASH_COMPLETION) > $@
doc/%.png: doc/%.dot
@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
$(DOT) -Tpng -o $@ $<
-doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
-
-doc/rapi.html: doc/rapi-resources.gen
-
-doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
- PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
- rm -f $@
-
man/%.7.in man/%.8.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
- @test -n "$(DOCBOOK2MAN)" || { echo 'docbook2html' not found during configure; exit 1; }
- TMPDIR=`mktemp -d` && { \
- $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
- mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
- rm -rf "$$TMPDIR" ; \
- }
+ @test -n "$(DOCBOOK2MAN)" || { echo 'docbook2man' not found during configure; exit 1; }
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
@test -n "$(DOCBOOK2HTML)" || { echo 'docbook2html' not found during configure; exit 1; }
- TMPDIR=`mktemp -d` && { \
- $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $$TMPDIR/$(patsubst man/%.in,%,$@) ; \
- mv $$TMPDIR/$(patsubst man/%.in,%,$@) $@ ; \
- rm -rf "$$TMPDIR" ; \
- }
+ $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
sed -f $(REPLACE_VARS_SED) < $< > $@
-man/footer.sgml $(TESTS): srclinks
-
-$(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
-
lib/_autoconf.py: Makefile stamp-directories
set -e; \
{ echo '# This file is automatically generated, do not edit!'; \
echo "SSH_INITD_SCRIPT = '$(SSH_INITD_SCRIPT)'"; \
echo "EXPORT_DIR = '$(EXPORT_DIR)'"; \
echo "OS_SEARCH_PATH = [$(OS_SEARCH_PATH)]"; \
+ echo "XEN_BOOTLOADER = '$(XEN_BOOTLOADER)'"; \
echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
echo "XEN_INITRD = '$(XEN_INITRD)'"; \
echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
echo "KVM_PATH = '$(KVM_PATH)'"; \
echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
- echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)" ; \
+ echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
+ echo "TOOLSDIR = '$(toolsdir)'"; \
+ echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
} > $@
$(REPLACE_VARS_SED): Makefile stamp-directories
{ echo 's#@PREFIX@#$(prefix)#g'; \
echo 's#@SYSCONFDIR@#$(sysconfdir)#g'; \
echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
+ echo 's#@BINDIR@#$(bindir)#g'; \
echo 's#@SBINDIR@#$(sbindir)#g'; \
echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
+ echo 's#@CUSTOM_XEN_BOOTLOADER@#$(XEN_BOOTLOADER)#g'; \
echo 's#@CUSTOM_XEN_KERNEL@#$(XEN_KERNEL)#g'; \
echo 's#@CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
# We need to create symlinks because "make distcheck" will not install Python
# files when building.
-#.PHONY: srclinks
srclinks: stamp-directories
set -e; \
- for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
- $(rapi_PYTHON) $(http_PYTHON); do \
+ for i in $(srclink_files); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
$(LN_S) $(abs_top_srcdir)/$$i $$i; \
fi; \
ganeti:
cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
+check-local:
+ $(CHECK_PYTHON_CODE) $(check_python_code)
+
# a dist hook rule for catching revision control directories
distcheck-hook:
if find $(top_distdir) | grep -F -e '.svn' -e '.git'; then \
touch $@
.PHONY: apidoc
-apidoc:
+apidoc: epydoc.conf $(RUN_IN_TEMPDIR)
test -e doc/api || mkdir doc/api
- TMPDIR=`mktemp -d ` && { \
- cp -r scripts daemons lib $$TMPDIR && \
- ( \
- CDIR=`pwd` && \
- cd $$TMPDIR && \
- mv lib ganeti && \
- epydoc -v --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
- ) ; \
- rm -rf $$TMPDIR ; \
- }
+ $(RUN_IN_TEMPDIR) epydoc -v \
+ --conf $(CURDIR)/epydoc.conf \
+ --output $(CURDIR)/doc/api
+
+.PHONY: TAGS
+TAGS:
+ rm -f TAGS
+ find . -path './lib/*.py' -o -path 'scripts/gnt-*' -o \
+ -path 'daemons/ganeti-*' -o -path 'tools/*' | \
+ etags -
# vim: set noet :