Document requirement for ipaddr and bitarray modules

[ganeti-local] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8c2fe23..b1e8ee9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,8 @@ myexeclibdir = $(pkglibdir)
 HTOOLS_DIRS = \
        htools \
        htools/Ganeti \
+       htools/Ganeti/Block \
+       htools/Ganeti/Block/Drbd \
        htools/Ganeti/Confd \
        htools/Ganeti/HTools \
        htools/Ganeti/HTools/Backend \
@@ -65,6 +67,8 @@ HTOOLS_DIRS = \
        htest \
        htest/Test \
        htest/Test/Ganeti \
+       htest/Test/Ganeti/Block \
+       htest/Test/Ganeti/Block/Drbd \
        htest/Test/Ganeti/Confd \
        htest/Test/Ganeti/HTools \
        htest/Test/Ganeti/HTools/Backend \
@@ -108,6 +112,8 @@ BUILDTIME_DIR_AUTOCREATE = \
        $(APIDOC_DIR) \
        $(APIDOC_HS_DIR) \
        $(APIDOC_HS_DIR)/Ganeti \
+       $(APIDOC_HS_DIR)/Ganeti/Block \
+       $(APIDOC_HS_DIR)/Ganeti/Block/Drbd \
        $(APIDOC_HS_DIR)/Ganeti/Confd \
        $(APIDOC_HS_DIR)/Ganeti/HTools \
        $(APIDOC_HS_DIR)/Ganeti/HTools/Backend \
@@ -257,6 +263,7 @@ pkgpython_PYTHON = \
        lib/storage.py \
        lib/uidpool.py \
        lib/vcluster.py \
+       lib/network.py \
        lib/workerpool.py
 
 client_PYTHON = \
@@ -268,6 +275,7 @@ client_PYTHON = \
        lib/client/gnt_instance.py \
        lib/client/gnt_job.py \
        lib/client/gnt_node.py \
+       lib/client/gnt_network.py \
        lib/client/gnt_os.py
 
 hypervisor_PYTHON = \
@@ -426,6 +434,8 @@ HPCEXCL = --exclude Main \
        $(patsubst htools.%,--exclude Test.%,$(subst /,.,$(patsubst %.hs,%, $(HS_LIB_SRCS))))
 
 HS_LIB_SRCS = \
+       htools/Ganeti/Block/Drbd/Types.hs \
+       htools/Ganeti/Block/Drbd/Parser.hs \
        htools/Ganeti/BasicTypes.hs \
        htools/Ganeti/Common.hs \
        htools/Ganeti/Compat.hs \
@@ -464,6 +474,7 @@ HS_LIB_SRCS = \
        htools/Ganeti/Luxi.hs \
        htools/Ganeti/Objects.hs \
        htools/Ganeti/OpCodes.hs \
+       htools/Ganeti/OpParams.hs \
        htools/Ganeti/Path.hs \
        htools/Ganeti/Query/Common.hs \
        htools/Ganeti/Query/Filter.hs \
@@ -477,11 +488,13 @@ HS_LIB_SRCS = \
        htools/Ganeti/Runtime.hs \
        htools/Ganeti/Ssconf.hs \
        htools/Ganeti/THH.hs \
+       htools/Ganeti/Types.hs \
        htools/Ganeti/Utils.hs
 
 HS_TEST_SRCS = \
        htest/Test/Ganeti/Attoparsec.hs \
        htest/Test/Ganeti/BasicTypes.hs \
+       htest/Test/Ganeti/Block/Drbd/Parser.hs \
        htest/Test/Ganeti/Common.hs \
        htest/Test/Ganeti/Confd/Utils.hs \
        htest/Test/Ganeti/Daemon.hs \
@@ -510,6 +523,7 @@ HS_TEST_SRCS = \
        htest/Test/Ganeti/TestCommon.hs \
        htest/Test/Ganeti/TestHTools.hs \
        htest/Test/Ganeti/TestHelper.hs \
+       htest/Test/Ganeti/Types.hs \
        htest/Test/Ganeti/Utils.hs
 
 HS_LIBTEST_SRCS = $(HS_LIB_SRCS) $(HS_TEST_SRCS)
@@ -579,6 +593,7 @@ gnt_scripts = \
        scripts/gnt-group \
        scripts/gnt-instance \
        scripts/gnt-job \
+       scripts/gnt-network \
        scripts/gnt-node \
        scripts/gnt-os
 
@@ -784,6 +799,7 @@ man_MANS = \
        man/gnt-cluster.8 \
        man/gnt-debug.8 \
        man/gnt-group.8 \
+       man/gnt-network.8 \
        man/gnt-instance.8 \
        man/gnt-job.8 \
        man/gnt-node.8 \
@@ -878,6 +894,7 @@ TEST_FILES = \
        test/data/proc_drbd80-emptyline.txt \
        test/data/proc_drbd83.txt \
        test/data/proc_drbd83_sync.txt \
+       test/data/proc_drbd83_sync_want.txt \
        test/data/proc_drbd83_sync_krnl2.6.39.txt \
        test/data/sys_drbd_usermode_helper.txt \
        test/data/vgreduce-removemissing-2.02.02.txt \
@@ -1454,6 +1471,9 @@ check-local: check-dirs $(GENERATED_FILES)
        if ! test -f $(top_srcdir)/doc/design-$$expver.rst; then \
                echo "File $(top_srcdir)/doc/design-$$expver.rst not found"; \
                exit 1; \
+       fi; \
+       if test $$(wc --max-line-length < $(top_srcdir)/configure.ac) -gt 80; then \
+               echo 'Longest line in configure.ac is longer than 80 characters' >&2; \
        fi
 
 .PHONY: hs-check
@@ -1514,7 +1534,7 @@ pep8: $(GENERATED_FILES)
 hlint: $(HS_BUILT_SRCS) htools/lint-hints.hs
        @test -n "$(HLINT)" || { echo 'hlint' not found during configure; exit 1; }
        if tty -s; then C="-c"; else C=""; fi; \
-       $(HLINT) --report=doc/hs-lint.html --cross $$C \
+       $(HLINT) --utf8 --report=doc/hs-lint.html --cross $$C \
          --ignore "Use first" \
          --ignore "Use comparing" \
          --ignore "Use on" \
@@ -1612,6 +1632,8 @@ hs-apidoc: $(HS_BUILT_SRCS)
        rm -rf $(APIDOC_HS_DIR)/*
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Backend
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/HTools/Program
+       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Block
+       @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Block/Drbd
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Confd
        @mkdir_p@ $(APIDOC_HS_DIR)/Ganeti/Query
        $(HSCOLOUR) -print-css > $(APIDOC_HS_DIR)/Ganeti/hscolour.css