X-Git-Url: https://code.grnet.gr/git/ganeti-local/blobdiff_plain/01f3e7b1a1fbbcc09f85cfa4fe9c5f9912ce1056..af64c0eac10e030337b3316b75bea80f57d31be8:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0af6e45..2872e7a 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)
@@ -26,6 +27,7 @@ DIRS = \
 	doc \
 	doc/examples \
 	lib \
+	lib/http \
 	lib/hypervisor \
 	lib/rapi \
 	man \
@@ -41,10 +43,12 @@ CLEANFILES = \
 	doc/*.html \
 	doc/*.in \
 	doc/*.pdf \
+	$(patsubst %.dot,%.png,$(docdot)) \
 	doc/rapi-resources.sgml \
 	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] \
@@ -68,7 +72,6 @@ pkgpython_PYTHON = \
 	lib/constants.py \
 	lib/daemon.py \
 	lib/errors.py \
-	lib/http.py \
 	lib/jqueue.py \
 	lib/jstore.py \
 	lib/locking.py \
@@ -94,9 +97,14 @@ rapi_PYTHON = \
 	lib/rapi/__init__.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 \
@@ -106,17 +114,12 @@ docsgml = \
 	doc/iallocator.sgml
 
 docrst = \
-	doc/design-2.0-cluster-parameters.rst \
-	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-os-interface.rst \
-	doc/design-2.0-rapi-changes.rst \
+	doc/design-2.0.rst \
 	doc/security.rst
 
+docdot = \
+	doc/arch-2.0.dot
+
 doc_DATA = \
 	$(patsubst %.rst,%.html,$(docrst)) \
 	$(patsubst %.sgml,%.html,$(docsgml)) \
@@ -147,6 +150,7 @@ EXTRA_DIST = \
 	autotools/docbook-wrapper \
 	devel/upload.in \
 	$(docrst) \
+	$(docdot) \
 	$(docsgml) \
 	doc/build-rapi-resources-doc \
 	doc/examples/ganeti.initd.in \
@@ -194,18 +198,19 @@ TEST_FILES = \
 	test/data/proc_drbd8.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.cli_unittest.py
+	test/ganeti.serializer_unittest.py \
+	test/ganeti.ssh_unittest.py \
+	test/ganeti.utils_unittest.py \
+	test/ganeti.workerpool_unittest.py
 
 nodist_TESTS =
 
@@ -240,6 +245,11 @@ doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
 doc/%.html: doc/%.rst
 	$(RST2HTML) $< $@
 
+doc/%.png: doc/%.dot
+	$(DOT) -Tpng -o $@ $<
+
+doc/design-2.0.html: doc/design-2.0.rst doc/arch-2.0.png
+
 doc/rapi.pdf doc/rapi.html doc/rapi.in: doc/rapi-resources.sgml
 
 doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
@@ -259,6 +269,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)'"; \
@@ -275,6 +294,8 @@ 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)'"; \
 	} > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -298,7 +319,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; \
@@ -327,12 +349,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 ; \
 	}