X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/4f3d5b76099db755a45ea82ce485259c11e35640..e7f6524cb6832123895a390a662b180b7a4515d3:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fedd0db..718775e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,8 @@ abs_top_srcdir = @abs_top_srcdir@
 ACLOCAL_AMFLAGS = -I autotools
 DOCBOOK_WRAPPER = $(top_srcdir)/autotools/docbook-wrapper
 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
@@ -29,6 +31,7 @@ DIRS = \
 	doc/examples \
 	doc/examples/hooks \
 	lib \
+	lib/build \
 	lib/http \
 	lib/hypervisor \
 	lib/rapi \
@@ -42,18 +45,25 @@ DIRS = \
 
 MAINTAINERCLEANFILES = \
 	$(docpng) \
-	$(maninput)
+	$(maninput) \
+	doc/install-quick.rst \
+	doc/news.rst
 
 maintainer-clean-local:
-	-rm -rf doc/api doc/build doc/html
+	rm -rf doc/api doc/html
 
 CLEANFILES = \
 	autotools/replace_vars.sed \
+	daemons/daemon-util \
+	daemons/ganeti-cleaner \
 	devel/upload \
 	doc/examples/bash_completion \
 	doc/examples/ganeti.initd \
 	doc/examples/ganeti.cron \
+	doc/examples/gnt-config-backup \
+	doc/examples/hooks/ipsec \
 	lib/*.py[co] \
+	lib/build/*.py[co] \
 	lib/http/*.py[co] \
 	lib/hypervisor/*.py[co] \
 	lib/rapi/*.py[co] \
@@ -62,11 +72,21 @@ CLEANFILES = \
 	qa/*.py[co] \
 	test/*.py[co] \
 	stamp-directories \
+	stamp-srclinks \
 	$(nodist_pkgpython_PYTHON)
 
+BUILT_SOURCES = \
+	ganeti \
+	stamp-srclinks \
+	stamp-directories \
+	lib/_autoconf.py
+
 nodist_pkgpython_PYTHON = \
 	lib/_autoconf.py
 
+noinst_PYTHON = \
+	lib/build/__init__.py
+
 pkgpython_PYTHON = \
 	lib/__init__.py \
 	lib/asyncnotifier.py \
@@ -116,6 +136,7 @@ http_PYTHON = \
 
 confd_PYTHON = \
 	lib/confd/__init__.py \
+	lib/confd/client.py \
 	lib/confd/server.py \
 	lib/confd/querylib.py
 
@@ -123,31 +144,66 @@ 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-quick.rst \
 	doc/install.rst \
+	doc/locking.rst \
+	doc/news.rst \
 	doc/rapi.rst \
-	doc/security.rst
+	doc/security.rst \
+	doc/walkthrough.rst
 
-doc/html: $(docrst) $(docpng) doc/conf.py configure.ac
+doc/html/.stamp: $(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 \
+	PYTHONPATH=. $(RUN_IN_TEMPDIR) $(SPHINX) -q -W -b html \
+	    -d . \
 	    -D version="$(VERSION_MAJOR).$(VERSION_MINOR)" \
 	    -D release="$(PACKAGE_VERSION)" \
-	    $(top_srcdir)/doc doc/html
-	touch "$@"
+	    $(abs_top_srcdir)/doc $(CURDIR)/doc/html
+	rm -f doc/html/.buildinfo doc/html/objects.inv
+	touch $@
+
+doc/html: doc/html/.stamp
+
+doc/news.rst: NEWS
+	set -e; \
+	{ echo '.. This file is automatically updated at build time from $<.'; \
+	  echo '.. Do not edit.'; \
+	  echo; \
+	  cat $<; \
+	} > $@
+
+doc/install-quick.rst: INSTALL
+	set -e; \
+	{ echo '.. This file is automatically updated at build time from $<.'; \
+	  echo '.. Do not edit.'; \
+	  echo; \
+	  cat $<; \
+	} > $@
 
 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
 
 docpng = $(patsubst %.dot,%.png,$(docdot))
 
-noinst_DATA = $(manhtml) doc/html
+# Things to build but not to install (add it to EXTRA_DIST if it should be
+# distributed)
+noinst_DATA = \
+	devel/upload \
+	doc/html \
+	doc/examples/bash_completion \
+	doc/examples/ganeti.cron \
+	doc/examples/ganeti.initd \
+	doc/examples/gnt-config-backup \
+	doc/examples/hooks/ipsec \
+	$(manhtml)
 
 gnt_scripts = \
 	scripts/gnt-backup \
@@ -166,34 +222,46 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-rapi \
 	$(gnt_scripts)
 
+nodist_sbin_SCRIPTS = \
+	daemons/ganeti-cleaner
+
 dist_tools_SCRIPTS = \
 	tools/burnin \
 	tools/cfgshell \
 	tools/cfgupgrade \
 	tools/lvmstrap
 
+pkglib_SCRIPTS = \
+	daemons/daemon-util
+
 EXTRA_DIST = \
-	$(MAINTAINERCLEANFILES) \
 	NEWS \
-	DEVNOTES \
 	pylintrc \
+	autotools/build-bash-completion \
+	autotools/check-python-code \
 	autotools/docbook-wrapper \
+	$(RUN_IN_TEMPDIR) \
+	daemons/daemon-util.in \
+	daemons/ganeti-cleaner.in \
 	devel/upload.in \
 	$(docdot) \
+	$(docpng) \
 	$(docrst) \
 	doc/conf.py \
 	doc/html \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
+	doc/examples/gnt-config-backup.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_FILES) \
 	man/footer.sgml \
-	$(mansgml) $(maninput) \
+	$(mansgml) \
+	$(maninput) \
 	qa/ganeti-qa.py \
 	qa/qa-sample.json \
 	qa/qa_cluster.py \
@@ -210,6 +278,8 @@ EXTRA_DIST = \
 
 man_MANS = \
 	man/ganeti.7 \
+	man/ganeti-cleaner.8 \
+	man/ganeti-confd.8 \
 	man/ganeti-masterd.8 \
 	man/ganeti-noded.8 \
 	man/ganeti-os-interface.7 \
@@ -225,7 +295,9 @@ man_MANS = \
 
 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))
+maninput = \
+	$(patsubst %.7,%.7.in,$(patsubst %.8,%.8.in,$(man_MANS))) \
+	$(patsubst %.html,%.html.in,$(manhtml))
 
 TEST_FILES = \
 	test/data/bdev-both.txt \
@@ -233,86 +305,97 @@ TEST_FILES = \
 	test/data/bdev-disk.txt \
 	test/data/bdev-net.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.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)
 
-all-local: stamp-directories lib/_autoconf.py devel/upload \
-	doc/examples/bash_completion \
-	doc/examples/ganeti.initd doc/examples/ganeti.cron
+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)
 
-devel/upload: devel/upload.in stamp-directories $(REPLACE_VARS_SED)
+check_python_code = \
+	$(all_python_code)
+
+devel/upload: devel/upload.in $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 	chmod u+x $@
 
-doc/examples/%: doc/examples/%.in stamp-directories \
+daemons/%: daemons/%.in \
+		$(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
+	chmod +x $@
+
+doc/examples/%: doc/examples/%.in \
+		$(REPLACE_VARS_SED)
+	sed -f $(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) lib/_autoconf.py \
+doc/examples/bash_completion: $(BUILD_BASH_COMPLETION) $(RUN_IN_TEMPDIR) \
 	lib/cli.py $(gnt_scripts) tools/burnin
-	TMPDIR=`mktemp -d ./buildtmpXXXXXX` && \
-	cp -r scripts lib tools $$TMPDIR && \
-	( \
-		CDIR=`pwd` && \
-		cd $$TMPDIR && \
-		mv lib ganeti && \
-		PYTHONPATH=. $$CDIR/$(BUILD_BASH_COMPLETION) > $$CDIR/$@; \
-	); \
-	rm -rf $$TMPDIR
+	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 $@ $<
 
 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" ; \
-	}
-
-man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
-	sed -f $(REPLACE_VARS_SED) < $< > $@
+	@test -n "$(DOCBOOK2HTML)" || \
+	  { echo 'docbook2html' not found during configure; exit 1; }
+	$(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $(notdir $(@:.in=)) $@
 
-man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
+man/%.7: man/%.7.in $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
+man/%.8: man/%.8.in $(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/footer.sgml $(TESTS): srclinks
-
-$(TESTS): ganeti lib/_autoconf.py
+man/%.html: man/%.html.in $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
 lib/_autoconf.py: Makefile stamp-directories
 	set -e; \
@@ -335,54 +418,68 @@ lib/_autoconf.py: Makefile stamp-directories
 	  echo "VERSION_FULL = '$(VERSION_FULL)'"; \
 	  echo "LOCALSTATEDIR = '$(localstatedir)'"; \
 	  echo "SYSCONFDIR = '$(sysconfdir)'"; \
-	  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 "SOCAT_PATH = '$(SOCAT)'"; \
+	  echo "SOCAT_USE_ESCAPE = $(SOCAT_USE_ESCAPE)"; \
 	  echo "LVM_STRIPECOUNT = $(LVM_STRIPECOUNT)"; \
 	  echo "TOOLSDIR = '$(toolsdir)'"; \
 	  echo "GNT_SCRIPTS = [$(foreach i,$(notdir $(gnt_scripts)),'$(i)',)]"; \
+	  echo "PKGLIBDIR = '$(pkglibdir)'"; \
 	} > $@
 
-$(REPLACE_VARS_SED): Makefile stamp-directories
+$(REPLACE_VARS_SED): Makefile
 	set -e; \
 	{ 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'; \
+	  echo 's#@RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#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
+stamp-srclinks: Makefile stamp-directories
 	set -e; \
-	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
-			$(rapi_PYTHON) $(http_PYTHON) $(confd_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; \
 	done
+	touch $@
 
 .PHONY: ganeti
 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 \
-		echo "Found revision control files in final archive" 1>&2 ; \
+	if find $(top_distdir) -name .svn -or -name .git | grep .; then \
+		echo "Found revision control files in final archive." 1>&2; \
+		exit 1; \
+	fi
+	if find $(top_distdir) -name '*.py[co]' | grep .; then \
+		echo "Found Python byte code in final archive." 1>&2; \
+		exit 1; \
+	fi
+	if find $(top_distdir) -name '*~' | grep .; then \
+		echo "Found backup files in final archive." 1>&2; \
 		exit 1; \
 	fi
 
@@ -396,18 +493,11 @@ stamp-directories: Makefile
 	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: