Raise on invalid gnt-cluster queue commands
[ganeti-local] / Makefile.am
index 16e3cce..7206b09 100644 (file)
@@ -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,14 +43,18 @@ CLEANFILES = \
        doc/*.html \
        doc/*.in \
        doc/*.pdf \
-       doc/rapi-resources.sgml \
+       $(patsubst %.dot,%.png,$(docdot)) \
+       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/*.html \
        qa/*.py[co] \
        test/*.py[co] \
        stamp-directories \
@@ -68,7 +74,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,25 +99,30 @@ 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 \
-       doc/install.sgml \
-       doc/admin.sgml \
-       doc/rapi.sgml \
-       doc/iallocator.sgml
 
 docrst = \
+       doc/admin.rst \
        doc/design-2.0.rst \
+       doc/hooks.rst \
+       doc/iallocator.rst \
+       doc/install.rst \
        doc/security.rst
 
+docdot = \
+       doc/arch-2.0.dot
+
 doc_DATA = \
-       $(patsubst %.rst,%.html,$(docrst)) \
-       $(patsubst %.sgml,%.html,$(docsgml)) \
-       $(patsubst %.sgml,%.pdf,$(docsgml))
+       $(patsubst %.rst,%.html,$(docrst))
+
+noinst_DATA = $(manhtml)
 
 dist_sbin_SCRIPTS = \
        daemons/ganeti-noded \
@@ -139,8 +149,9 @@ EXTRA_DIST = \
        autotools/docbook-wrapper \
        devel/upload.in \
        $(docrst) \
-       $(docsgml) \
+       $(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 \
@@ -167,17 +178,22 @@ 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))
+manhtml = $(patsubst %.in,%.html,$(maninput))
 
 TEST_FILES = \
        test/data/bdev-both.txt \
@@ -186,18 +202,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 =
 
@@ -205,15 +222,17 @@ TESTS = $(dist_TESTS) $(nodist_TESTS)
 
 TESTS_ENVIRONMENT = PYTHONPATH=.:$(top_builddir)
 
+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) < $< > $@
 
@@ -226,9 +245,6 @@ man/%.in: man/%.sgml stamp-directories $(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) $< $@
 
@@ -237,10 +253,11 @@ doc/%.png: doc/%.dot
 
 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.pdf doc/rapi.html: doc/rapi-resources.gen
 
-doc/rapi-resources.sgml: $(BUILD_RAPI_RESOURCE_DOC) lib/rapi/connector.py
-       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || rm -f $@
+doc/rapi-resources.gen: $(BUILD_RAPI_RESOURCE_DOC) $(RAPI_RESOURCES)
+       PYTHONPATH=.:$(top_builddir) $(BUILD_RAPI_RESOURCE_DOC) > $@ || \
+         rm -f $@
 
 man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
@@ -248,6 +265,9 @@ man/%.7: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
 man/%.8: man/%.in man/footer.sgml $(DOCBOOK_WRAPPER)
        $(DOCBOOK_WRAPPER) "$(DOCBOOK2MAN)" $< $@
 
+man/%.html: man/%.in $(DOCBOOK_WRAPPER)
+       $(DOCBOOK_WRAPPER) "$(DOCBOOK2HTML) --nochunks" $< $@
+
 man/footer.sgml $(TESTS): srclinks
 
 $(TESTS) $(BUILD_RAPI_RESOURCE_DOC): ganeti lib/_autoconf.py
@@ -256,6 +276,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)'"; \
@@ -272,6 +301,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
@@ -281,13 +312,9 @@ $(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'; \
        } > $@
 
 # We need to create symlinks because "make distcheck" will not install Python
@@ -295,7 +322,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; \
@@ -324,12 +352,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 ; \
        }