Log the rpc call name in the RPC errors message
[ganeti-local] / Makefile.am
index 7b8bae0..b1c4090 100644 (file)
@@ -3,7 +3,7 @@
 # - Keep files sorted; one line per file.
 # - Directories in lib/ must have their own *dir variable (see hypervisor).
 # - All directories must be listed DIRS.
-# - Use autogen.sh to generate Makefile.in and configure script
+# - Use autogen.sh to generate Makefile.in and configure script.
 
 # Automake doesn't export these variables before version 1.10.
 abs_top_builddir = @abs_top_builddir@
@@ -11,9 +11,11 @@ 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
 REPLACE_VARS_SED = autotools/replace_vars.sed
 
 hypervisordir = $(pkgpythondir)/hypervisor
+httpdir = $(pkgpythondir)/http
 rapidir = $(pkgpythondir)/rapi
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
@@ -25,11 +27,11 @@ DIRS = \
        doc \
        doc/examples \
        lib \
+       lib/http \
        lib/hypervisor \
        lib/rapi \
        man \
        qa \
-       qa/hooks \
        scripts \
        test \
        test/data \
@@ -41,15 +43,17 @@ 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] \
        man/*.in \
        qa/*.py[co] \
-       qa/hooks/*.py[co] \
        test/*.py[co] \
        stamp-directories \
        $(nodist_pkgpython_PYTHON)
@@ -66,11 +70,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 \
@@ -86,29 +90,45 @@ hypervisor_PYTHON = \
        lib/hypervisor/__init__.py \
        lib/hypervisor/hv_base.py \
        lib/hypervisor/hv_fake.py \
+       lib/hypervisor/hv_kvm.py \
        lib/hypervisor/hv_xen.py
 
 rapi_PYTHON = \
        lib/rapi/__init__.py \
-       lib/rapi/RESTHTTPServer.py \
-       lib/rapi/httperror.py \
-       lib/rapi/resources.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
 
+docrst = \
+       doc/design-2.0.rst \
+       doc/security.rst
+
+docdot = \
+       doc/arch-2.0.dot
+
 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-master \
        daemons/ganeti-masterd \
        daemons/ganeti-rapi \
        scripts/gnt-backup \
@@ -130,12 +150,14 @@ EXTRA_DIST = \
        DEVNOTES \
        autotools/docbook-wrapper \
        devel/upload.in \
+       $(docrst) \
+       $(docdot) \
        $(docsgml) \
+       doc/build-rapi-resources-doc \
        doc/examples/ganeti.initd.in \
        doc/examples/ganeti.cron.in \
        doc/examples/dumb-allocator \
-       qa/hooks/datehook.py \
-       qa/hooks/loghook.py \
+       doc/locking.txt \
        test/testutils.py \
        test/mocks.py \
        $(dist_TESTS) \
@@ -143,7 +165,7 @@ EXTRA_DIST = \
        man/footer.sgml \
        $(mansgml) \
        qa/ganeti-qa.py \
-       qa/qa-sample.yaml \
+       qa/qa-sample.json \
        qa/qa_cluster.py \
        qa/qa_config.py \
        qa/qa_daemon.py \
@@ -152,13 +174,12 @@ EXTRA_DIST = \
        qa/qa_instance.py \
        qa/qa_node.py \
        qa/qa_os.py \
-       qa/qa_other.py \
+       qa/qa_rapi.py \
        qa/qa_tags.py \
        qa/qa_utils.py
 
 man_MANS = \
        man/ganeti.7 \
-       man/ganeti-master.8 \
        man/ganeti-noded.8 \
        man/ganeti-os-interface.7 \
        man/ganeti-watcher.8 \
@@ -178,15 +199,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.rapi.resources_unittest.py \
        test/ganeti.serializer_unittest.py \
-       test/ganeti.workerpool_unittest.py \
-       test/ganeti.constants_unittest.py
+       test/ganeti.ssh_unittest.py \
+       test/ganeti.utils_unittest.py \
+       test/ganeti.workerpool_unittest.py
 
 nodist_TESTS =
 
@@ -213,25 +238,47 @@ man/%.in: man/%.sgml stamp-directories $(REPLACE_VARS_SED)
        sed -f $(REPLACE_VARS_SED) < $< > $@
 
 doc/%.pdf: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2PDF)" $< $@
 
 doc/%.html: doc/%.in $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
+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
+       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
-       $(DOCBOOK_WRAPPER) $< $@
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
 man/footer.sgml $(TESTS): srclinks
 
-$(TESTS): ganeti
+$(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 '#'; \
+         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)'"; \
@@ -247,6 +294,8 @@ lib/_autoconf.py: Makefile stamp-directories
          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 "SOCAT_PATH = '$(SOCAT_PATH)'"; \
        } > $@
 
 $(REPLACE_VARS_SED): Makefile stamp-directories
@@ -259,6 +308,10 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
          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 '}'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -266,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; \
@@ -274,7 +328,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:
@@ -292,4 +346,18 @@ stamp-directories: Makefile
        @mkdir_p@ $(DIRS)
        touch $@
 
+.PHONY: apidoc
+apidoc:
+       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 ; \
+       }
+
 # vim: set noet :