X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/39e0d19e4291f9f3c6989eeb7c4b5f9b0c96cadc..f6a3270823e1c6f1ab5f0a014b4106947051210a:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f9682dd..cda2181 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
+httpdir = $(pkgpythondir)/http
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -25,7 +26,9 @@ DIRS = \
 	devel \
 	doc \
 	doc/examples \
+	doc/examples/hooks \
 	lib \
+	lib/http \
 	lib/hypervisor \
 	lib/rapi \
 	man \
@@ -35,20 +38,24 @@ DIRS = \
 	test/data \
 	tools
 
+MAINTAINERCLEANFILES = \
+	$(dochtml) \
+	$(patsubst %.dot,%.png,$(docdot)) \
+	$(maninput)
+
 CLEANFILES = \
 	autotools/replace_vars.sed \
 	devel/upload \
-	doc/*.html \
-	doc/*.in \
-	doc/*.pdf \
-	doc/rapi-resources.sgml \
+	doc/rapi-resources.gen \
+	doc/examples/bash_completion \
 	doc/examples/ganeti.initd \
 	doc/examples/ganeti.cron \
 	lib/*.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 \
@@ -66,12 +73,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 \
@@ -92,23 +98,33 @@ hypervisor_PYTHON = \
 
 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
+
+
+docrst = \
+	doc/admin.rst \
+	doc/design-2.0.rst \
+	doc/hooks.rst \
+	doc/iallocator.rst \
+	doc/install.rst \
+	doc/security.rst
+
+dochtml = $(patsubst %.rst,%.html,$(docrst))
 
-docsgml = \
-	doc/hooks.sgml \
-	doc/install.sgml \
-	doc/admin.sgml \
-	doc/rapi.sgml \
-	doc/iallocator.sgml
+docdot = \
+	doc/arch-2.0.dot
 
-doc_DATA = \
-	$(patsubst %.sgml,%.html,$(docsgml)) \
-	$(patsubst %.sgml,%.pdf,$(docsgml))
+doc_DATA = $(dochtml)
+
+noinst_DATA = $(manhtml)
 
 dist_sbin_SCRIPTS = \
 	daemons/ganeti-noded \
@@ -130,21 +146,27 @@ dist_tools_SCRIPTS = \
 	tools/lvmstrap
 
 EXTRA_DIST = \
+	$(MAINTAINERCLEANFILES) \
 	NEWS \
 	DEVNOTES \
+	pylintrc \
 	autotools/docbook-wrapper \
 	devel/upload.in \
-	$(docsgml) \
+	$(docrst) \
+	$(docdot) \
 	doc/build-rapi-resources-doc \
+	doc/examples/bash_completion.in \
 	doc/examples/ganeti.initd.in \
 	doc/examples/ganeti.cron.in \
 	doc/examples/dumb-allocator \
+	doc/examples/hooks/ethers \
+	doc/locking.txt \
 	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 \
@@ -161,77 +183,106 @@ EXTRA_DIST = \
 
 man_MANS = \
 	man/ganeti.7 \
+	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_drbd83.txt
 
 dist_TESTS = \
+	test/ganeti.bdev_unittest.py \
+	test/ganeti.cli_unittest.py \
+	test/ganeti.cmdlib_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.serializer_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.serializer_unittest.py \
+	test/ganeti.ssh_unittest.py \
+	test/ganeti.utils_unittest.py \
+	test/ganeti.workerpool_unittest.py
 
 nodist_TESTS =
 
 TESTS = $(dist_TESTS) $(nodist_TESTS)
 
-TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
+TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir) $(PYTHON)
 
+RAPI_RESOURCES = $(wildcard lib/rapi/*.py)
 
 all-local: stamp-directories lib/_autoconf.py devel/upload \
+	doc/examples/bash_completion \
 	doc/examples/ganeti.initd doc/examples/ganeti.cron
 
 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 \
+doc/examples/%: doc/examples/%.in stamp-directories \
 		$(REPLACE_VARS_SED)
 	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-doc/%.in: doc/%.sgml stamp-directories $(REPLACE_VARS_SED)
-	sed -f $(REPLACE_VARS_SED) < $< > $@
+doc/%.html: doc/%.rst
+	@test -n "$(RST2HTML)" || { echo 'rst2html' not found during configure; exit 1; }
+	$(RST2HTML) $< $@
 
-man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
-	sed -f $(REPLACE_VARS_SED) < $< > $@
+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/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
+	PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
+	  rm -f $@
 
-doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+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" ; \
+	}
 
-doc/rapi.pdf doc/rapi.html: doc/rapi-resources.sgml
+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" ; \
+	}
 
-doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
-	PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
+man/%.7: man/%.7.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+man/%.8: man/%.8.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
-man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-	$(DOCBOOK_WRAPPER) $< $@
+man/%.html: man/%.html.in stamp-directories $(REPLACE_VARS_SED)
+	sed -f $(REPLACE_VARS_SED) < $< > $@
 
 man/footer.sgml $(TESTS): srclinks
 
@@ -241,6 +292,15 @@ 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)'"; \
@@ -257,6 +317,9 @@ lib/_autoconf.py: Makefile stamp-directories
 	  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)" ; \
 	} > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -266,13 +329,10 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 	  echo 's#@LOCALSTATEDIR@#$(localstatedir)#g'; \
 	  echo 's#@SBINDIR@#$(sbindir)#g'; \
 	  echo 's#@GANETI_VERSION@#$(PACKAGE_VERSION)#g'; \
-	  echo 's#@LOCALSTATEDIR@#$(localstatedir)#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
@@ -280,7 +340,8 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
 #.PHONY: srclinks
 srclinks: stamp-directories
 	set -e; \
-	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) $(rapi_PYTHON); do \
+	for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
+			$(rapi_PYTHON) $(http_PYTHON); do \
 		if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
 			$(LN_S) $(abs_top_srcdir)/$$i $$i; \
 		fi; \
@@ -288,7 +349,7 @@ srclinks: stamp-directories
 
 .PHONY: ganeti
 ganeti:
-	cd $(top_builddir) && rm -f $@ && $(LN_S) lib $@
+	cd $(top_builddir) && test -h "$@" || { rm -f $@ && $(LN_S) lib $@; }
 
 # a dist hook rule for catching revision control directories
 distcheck-hook:
@@ -309,12 +370,13 @@ stamp-directories: Makefile
 .PHONY: apidoc
 apidoc:
 	test -e doc/api || mkdir doc/api
-	TMPDIR=`mktemp -d ./temp-epydoc.XXXXXX` && { \
+	TMPDIR=`mktemp -d ` && { \
 		cp -r scripts daemons lib $$TMPDIR && \
 		( \
+			CDIR=`pwd` && \
 			cd $$TMPDIR && \
 			mv lib ganeti && \
-			epydoc --conf ../epydoc.conf \
+			epydoc -v --conf $$CDIR/epydoc.conf -o $$CDIR/doc/api \
 		) ; \
 		rm -rf $$TMPDIR ; \
 	}