X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/2241e2b9fc9d1a5115c63a4d12c1379fe4c41a29..63d96e4c4557490d21930ea6c44e1468a850da75:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index dd5ad12..51270a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,10 +11,14 @@ abs_top_srcdir = @abs_top_srcdir@
 
 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)
@@ -25,9 +29,13 @@ DIRS = \
 	devel \
 	doc \
 	doc/examples \
+	doc/examples/hooks \
 	lib \
+	lib/build \
+	lib/http \
 	lib/hypervisor \
 	lib/rapi \
+	lib/confd \
 	man \
 	qa \
 	scripts \
@@ -35,30 +43,47 @@ DIRS = \
 	test/data \
 	tools
 
+MAINTAINERCLEANFILES = \
+	$(docpng) \
+	$(maninput)
+
+maintainer-clean-local:
+	-rm -rf doc/api doc/build doc/html
+
 CLEANFILES = \
 	autotools/replace_vars.sed \
+	daemons/ganeti-cleaner \
 	devel/upload \
-	doc/*.html \
-	doc/*.in \
-	doc/*.pdf \
-	doc/rapi-resources.sgml \
+	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] \
-	man/*.[78] \
-	man/*.in \
+	$(man_MANS) \
+	$(manhtml) \
 	qa/*.py[co] \
 	test/*.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 \
@@ -66,12 +91,11 @@ pkgpython_PYTHON = \
 	lib/cmdlib.py \
 	lib/config.py \
 	lib/constants.py \
+	lib/daemon.py \
 	lib/errors.py \
-	lib/http.py \
 	lib/jqueue.py \
 	lib/jstore.py \
 	lib/locking.py \
-	lib/logger.py \
 	lib/luxi.py \
 	lib/mcpu.py \
 	lib/objects.py \
@@ -80,51 +104,71 @@ pkgpython_PYTHON = \
 	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
 
 rapi_PYTHON = \
 	lib/rapi/__init__.py \
-	lib/rapi/httperror.py \
 	lib/rapi/baserlib.py \
 	lib/rapi/connector.py \
-	lib/rapi/rlib1.py \
 	lib/rapi/rlib2.py
 
+http_PYTHON = \
+	lib/http/__init__.py \
+	lib/http/auth.py \
+	lib/http/client.py \
+	lib/http/server.py
 
-docsgml = \
-	doc/hooks.sgml \
-	doc/install.sgml \
-	doc/admin.sgml \
-	doc/rapi.sgml \
-	doc/iallocator.sgml
+confd_PYTHON = \
+	lib/confd/__init__.py \
+	lib/confd/client.py \
+	lib/confd/server.py \
+	lib/confd/querylib.py
 
 docrst = \
-	doc/design-2.0-commandline-parameters.rst \
-	doc/design-2.0-disk-handling.rst \
-	doc/design-2.0-index.rst \
-	doc/design-2.0-job-queue.rst \
-	doc/design-2.0-locking.rst \
-	doc/design-2.0-master-daemon.rst \
-	doc/design-2.0-rapi-changes.rst
-
-doc_DATA = \
-	$(patsubst %.rst,%.html,$(docrst)) \
-	$(patsubst %.sgml,%.html,$(docsgml)) \
-	$(patsubst %.sgml,%.pdf,$(docsgml))
-
-dist_sbin_SCRIPTS = \
-	daemons/ganeti-noded \
-	daemons/ganeti-watcher \
-	daemons/ganeti-masterd \
-	daemons/ganeti-rapi \
+	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
+
+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/design-2.1-lock-acquire.dot \
+	doc/design-2.1-lock-release.dot
+
+docpng = $(patsubst %.dot,%.png,$(docdot))
+
+noinst_DATA = $(manhtml) doc/html
+
+gnt_scripts = \
 	scripts/gnt-backup \
 	scripts/gnt-cluster \
 	scripts/gnt-debug \
@@ -133,6 +177,17 @@ dist_sbin_SCRIPTS = \
 	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
+
 dist_tools_SCRIPTS = \
 	tools/burnin \
 	tools/cfgshell \
@@ -140,23 +195,30 @@ dist_tools_SCRIPTS = \
 	tools/lvmstrap
 
 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 \
+	$(docdot) \
 	$(docrst) \
-	$(docsgml) \
-	doc/build-rapi-resources-doc \
+	doc/conf.py \
+	doc/html \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
 	doc/examples/dumb-allocator \
-	doc/locking.txt \
+	doc/examples/hooks/ethers \
+	doc/examples/hooks/ipsec.in \
 	test/testutils.py \
 	test/mocks.py \
 	$(dist_TESTS) \
 	$(TEST_FILES) \
 	man/footer.sgml \
-	$(mansgml) \
+	$(mansgml) $(maninput) \
 	qa/ganeti-qa.py \
 	qa/qa-sample.json \
 	qa/qa_cluster.py \
@@ -173,90 +235,138 @@ EXTRA_DIST = \
 
 man_MANS = \
 	man/ganeti.7 \
+	man/ganeti-cleaner.8 \
+	man/ganeti-masterd.8 \
 	man/ganeti-noded.8 \
 	man/ganeti-os-interface.7 \
+	man/ganeti-rapi.8 \
 	man/ganeti-watcher.8 \
 	man/gnt-backup.8 \
 	man/gnt-cluster.8 \
+	man/gnt-debug.8 \
 	man/gnt-instance.8 \
+	man/gnt-job.8 \
 	man/gnt-node.8 \
 	man/gnt-os.8
 
-maninput = $(patsubst %.7,%.in,$(patsubst %.8,%.in,$(man_MANS)))
-mansgml = $(patsubst %.in,%.sgml,$(maninput))
+mansgml = $(patsubst %.7,%.sgml,$(patsubst %.8,%.sgml,$(man_MANS)))
+manhtml = $(patsubst %.sgml,%.html,$(mansgml))
+maninput = $(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) $(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/proc_drbd8.txt
+	test/data/proc_drbd8.txt \
+	test/data/proc_drbd80-emptyline.txt \
+	test/data/proc_drbd83.txt
 
 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.utils_unittest.py \
-	test/ganeti.bdev_unittest.py \
-	test/ganeti.ssh_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.rapi.resources_unittest.py \
-	test/ganeti.http_unittest.py \
-	test/ganeti.constants_unittest.py \
-	test/ganeti.cli_unittest.py
+	test/docs_unittest.py
 
 nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
+TESTS_ENVIRONMENT = \
+	PYTHONPATH=. TOP_SRCDIR=$(abs_top_srcdir) \
+	$(RUN_IN_TEMPDIR) $(PYTHON)
 
+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 \
-	doc/examples/ganeti.initd doc/examples/ganeti.cron
+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/hooks/ipsec
 
 devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 	chmod u+x $@
 
-doc/examples/ganeti.%: doc/examples/ganeti.%.in stamp-directories \
+daemons/ganeti-cleaner: daemons/ganeti-cleaner.in stamp-directories \
 		$(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
+	chmod +x $@
 
-doc/%.in: doc/%.sgml stamp-directories $(REPLACE_VARS_SED)
+doc/examples/%: doc/examples/%.in stamp-directories \
+		$(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
+doc/examples/hooks/%: doc/examples/hooks/%.in stamp-directories \
+		$(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
-
-doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
-
-doc/%.html: doc/%.rst
-	$(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/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
+doc/%.png: doc/%.dot
+	@test -n "$(DOT)" || { echo 'dot' not found during configure; exit 1; }
+	$(DOT) -Tpng -o $@ $<
 
-doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
-	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 'docbook2man' not found during configure; exit 1; }
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $(notdir $(@:.in=)) $@
 
-man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
+man/%.html.in: man/%.sgml man/footer.sgml $(DOCBOOK_WRAPPER)
+	@test -n "$(DOCBOOK2HTML)" || { echo 'docbook2html' not found during configure; exit 1; }
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
 
-man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
+man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/footer.sgml $(TESTS): srclinks
+man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-$(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
+man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
 lib/_autoconf.py: Makefile stamp-directories
 	set -e; \
 	{ echo '# This file is automatically generated, do not edit!'; \
 	  echo '#'; \
+	  echo ''; \
+	  echo '"""Build-time configuration for Ganeti.'; \
+	  echo '';\
+	  echo 'This file is autogenerated by the build process.'; \
+	  echo 'For any changes you need to re-run ./configure (and'; \
+	  echo 'not edit by hand).'; \
+	  echo ''; \
+	  echo '"""'; \
+	  echo ''; \
 	  echo "PACKAGE_VERSION = '$(PACKAGE_VERSION)'"; \
 	  echo "VERSION_MAJOR = '$(VERSION_MAJOR)'"; \
 	  echo "VERSION_MINOR = '$(VERSION_MINOR)'"; \
@@ -268,11 +378,17 @@ lib/_autoconf.py: Makefile stamp-directories
 	  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 "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
 	  echo "KVM_PATH = '$(KVM_PATH)'"; \
+	  echo "KVM_MIGRATION_PORT = '$(KVM_MIGRATION_PORT)'"; \
+	  echo "SOCAT_PATH = '$(SOCAT_PATH)'"; \
+	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
+	  echo "TOOLSDIR = '$(toolsdir)'"; \
+	  echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
 	} > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -280,23 +396,21 @@ $(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#@LOCALSTATEDIR@#$(localstatedir)#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 '/@INCLUDE_RAPI_RESOURCES@/ {'; \
-	  echo '  r $(abs_top_builddir)/doc/rapi-resources.sgml'; \
-	  echo '  d'; \
-	  echo '}'; \
+	  echo 's#@RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
+	  echo 's#@PKGLIBDIR@#$(pkglibdir)#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); 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; \
@@ -304,7 +418,10 @@ srclinks: stamp-directories
 
 .PHONY: ganeti
 ganeti:
-	cd $(top_builddir) && rm -f $@ && $(LN_S) lib $@
+	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:
@@ -323,16 +440,17 @@ stamp-directories: Makefile
 	touch $@
 
 .PHONY: apidoc
-apidoc:
+apidoc: epydoc.conf $(RUN_IN_TEMPDIR)
 	test -e doc/api || mkdir doc/api
-	TMPDIR=`mktemp -d ./temp-epydoc.XXXXXX` && { \
-		cp -r scripts daemons lib $$TMPDIR && \
-		( \
-			cd $$TMPDIR && \
-			mv lib ganeti && \
-			epydoc --conf ../epydoc.conf \
-		) ; \
-		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 :